[libcw-cvs] [CVS] Module src

[Carlo W. <li...@us...>]

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2001-11-28 05:25:37 UTC

Modified files:
     libcwd/.cvsignore libcwd/Makefile.am libcwd/NEWS
     libcwd/acinclude.m4 libcwd/configure.in

Log message:

Fix for automake 1.5.

---------------------- diff included ----------------------
Index: src/libcwd/.cvsignore
diff -u src/libcwd/.cvsignore:1.15 src/libcwd/.cvsignore:1.16
--- src/libcwd/.cvsignore:1.15	Mon Aug 27 05:46:26 2001
+++ src/libcwd/.cvsignore	Thu Dec 27 21:25:27 2001
@@ -11,6 +11,8 @@
 config.sub
 ltconfig
 ltmain.sh
+depcomp
+stamp-h1
 config.h.in
 config.h
 stamp-h.in
Index: src/libcwd/Makefile.am
diff -u src/libcwd/Makefile.am:1.33 src/libcwd/Makefile.am:1.34
--- src/libcwd/Makefile.am:1.33	Sat Sep 22 22:01:08 2001
+++ src/libcwd/Makefile.am	Thu Dec 27 21:25:27 2001
@@ -47,6 +47,7 @@
 	rm -rf rpm
 
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure stamp-h.in Makefile.in \
-	install-sh missing mkinstalldirs config.guess config.sub ltmain.sh ltconfig
+	install-sh missing mkinstalldirs config.guess config.sub ltmain.sh ltconfig \
+	config.cache config.log config.status depcomp
 
 @MAINTAINER_MODE_TRUE@include maintMakefile
Index: src/libcwd/NEWS
diff -u src/libcwd/NEWS:1.60 src/libcwd/NEWS:1.61
--- src/libcwd/NEWS:1.60	Sat Sep 22 22:01:08 2001
+++ src/libcwd/NEWS	Thu Dec 27 21:25:27 2001
@@ -3,6 +3,10 @@
 	libcwd now works with (single threaded) qt applications.  A few major
 	bugs have been fixed.
 
+	Miscellaneous:
+	- The configuration option --disable-libcwd-location is fixed.
+	- Automake-1.5 now works.
+
 	API changes:
 
 	You now MUST use CWDEBUG, defining DEBUG will no longer work; it was
Index: src/libcwd/acinclude.m4
diff -u src/libcwd/acinclude.m4:1.42 src/libcwd/acinclude.m4:1.43
--- src/libcwd/acinclude.m4:1.42	Wed Sep 19 16:34:49 2001
+++ src/libcwd/acinclude.m4	Thu Dec 27 21:25:27 2001
@@ -148,7 +148,7 @@
     fi
   done
 fi]
-dnl `automake' looks for AC_OUTPUT and thinks `$1.in' etc.
+dnl `automake' looks for AC_OUTPUT and thinks `$1' etc.
 dnl is a literally required file unless we fool it a bit here:
 [AC_OUTPUT]([$1], [$2], [$3]))
 
@@ -512,9 +512,8 @@
 dnl Like AC_PROG_CXX, except that it demands that GNU g++-2.95.1
 dnl or higher is available.
 AC_DEFUN(CW_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
-AC_CHECK_PROGS(CXX, g++ c++)
-AC_PROG_CXX_WORKS
+[AC_BEFORE([$0], [CW_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXX])
 AC_CACHE_CHECK(whether we are using GNU C++ version 2.95.1 or later, ac_cv_prog_gxx_version,
 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
 cat > conftest.C <<EOF
@@ -550,7 +549,9 @@
 dnl
 dnl Like AC_PROG_CXXCPP but with bug work around that allows user to override CXXCPP.
 AC_DEFUN(CW_PROG_CXXCPP,
-[dnl This triggers the bug:
+[AC_BEFORE([$0], [AC_PROG_CXXCPP])
+AC_REQUIRE([CW_PROG_CXX])
+dnl This triggers the bug:
 if test -n "$CXXCPP"; then
 dnl Work around:
   unset ac_cv_prog_CXXCPP
@@ -567,7 +568,7 @@
 dnl
 dnl Extract finger prints of C++ compiler and preprocessor and C compiler which is used for linking.
 AC_DEFUN(CW_PROG_CXX_FINGER_PRINTS,
-[AC_REQUIRE([CW_PROG_CXX])
+[AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([CW_PROG_CXXCPP])
 AC_REQUIRE([AC_PROG_CC])
 cw_prog_cxx_finger_print="`$CXX -v 2>&1 | grep version | head -n 1`"
Index: src/libcwd/configure.in
diff -u src/libcwd/configure.in:1.84 src/libcwd/configure.in:1.85
--- src/libcwd/configure.in:1.84	Sat Sep 22 22:01:08 2001
+++ src/libcwd/configure.in	Thu Dec 27 21:25:27 2001
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.84 $)dnl
+AC_REVISION($Revision: 1.85 $)dnl
 
 dnl General intialization of `autoconf' varaibles.
 dnl Ensure that the directory specified with --srcdir was correct
@@ -100,12 +100,13 @@
 CW_ENVIRONMENT
 
 dnl Check for compiler and preprocessor
+AC_PROG_CC
+AC_PROG_CXX
 CW_PROG_CXX
 CW_PROG_CXXCPP
 if test -n "$CC"; then
   unset ac_cv_prog_CC
 fi
-AC_PROG_CC
 
 dnl Check if C compiler and C++ compiler versions match.
 CW_COMPILER_VERSIONS
@@ -128,8 +129,8 @@
 dnl We need to use these options for the tests too
 CXXFLAGS="$DEBUGOPTS $EXTRAOPTS"
 
-dnl This block cannot be replaced by a macro because the DISABLE_* and
-dnl PROG_LIBTOOL macros need to be in configure.in itself for some reason.
+dnl This block cannot be replaced by a macro because the DISABLE_* and the
+dnl AM_PROG_LIBTOOL macro need to be in configure.in itself for some reason.
 dnl This block is also present in src/libcw/configure.in!
 dnl Generate libtool (also checks shared/static prerequisites)
 if expr "$host" : ".*openbsd.*" >/dev/null; then
@@ -142,7 +143,7 @@
 test -n "$enable_shared" || enable_shared=yes
 test -n "$enable_static" || enable_static=yes
 dnl Note: due to a bug in libtool-1.3c, the language must be C at this point!
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 dnl Configuration needed by the testsuite, extract this from the generated 'libtool'
 enable_shared=`./libtool --config | grep '^build_libtool_libs=' | sed -e 's/build_libtool_libs=//'`
 enable_static=`./libtool --config | grep '^build_old_libs=' | sed -e 's/build_old_libs=//'`
----------------------- End of diff -----------------------