[libcw-cvs] [CVS] Module src

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

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-00-08 02:12:51 UTC

Modified files:
     libcwd/acinclude.m4 libcwd/configure.in

Log message:

Support for autoconf version 2.52.

---------------------- diff included ----------------------
Index: src/libcwd/acinclude.m4
diff -u src/libcwd/acinclude.m4:1.44 src/libcwd/acinclude.m4:1.45
--- src/libcwd/acinclude.m4:1.44	Sat Dec 29 20:17:46 2001
+++ src/libcwd/acinclude.m4	Mon Jan  7 18:12:41 2002
@@ -124,34 +124,6 @@
 #undef $i"
 done])
 
-dnl CW_OUTPUT([FILE... [, EXTRA_CMDS [, INIT-CMDS]]])
-dnl
-dnl Like AC_OUTPUT, but preserve the timestamp of the output files
-dnl when they are not changed.
-dnl
-AC_DEFUN(CW_OUTPUT,
-[AC_OUTPUT_COMMANDS(
-[for cw_outfile in $1; do
-  if test -f $cw_outfile.$cw_pid; then
-    if cmp -s $cw_outfile $cw_outfile.$cw_pid 2>/dev/null; then
-      echo "$cw_outfile is unchanged"
-      mv $cw_outfile.$cw_pid $cw_outfile
-    fi
-  fi
-  rm -f $cw_outfile.$cw_pid
-done], [cw_pid=$cw_pid])
-cw_pid=$$
-if test "$no_create" != yes; then
-  for cw_outfile in $1; do
-    if test -f $cw_outfile; then
-      mv $cw_outfile $cw_outfile.$cw_pid
-    fi
-  done
-fi]
-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]))
-
 dnl CW_DEFINE_TYPE_INITIALIZATION
 dnl
 AC_DEFUN(CW_DEFINE_TYPE_INITIALIZATION,
@@ -218,14 +190,14 @@
     dnl We need this comment to work around a bug in autoconf or m4: '['
     cw_result="`echo $cw_result | sed -e 's/.*detect_type.*with ARG = //g' -e 's/].*//'`"
   fi
+changequote([, ])dnl
   if test -z "$cw_result"; then
-    AC_MSG_ERROR(Configure problem: Failed to determine type)
+    AC_MSG_ERROR([Configure problem: Failed to determine type])
   fi
-changequote([, ])dnl
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  AC_MSG_ERROR(Configuration problem: Failed to compile a test program)
+  AC_MSG_ERROR([Configuration problem: Failed to compile a test program])
 fi
 CXXFLAGS="$save_CXXFLAGS"
 rm -f conftest*
@@ -306,10 +278,9 @@
 [cat > conftest.$ac_ext <<EOF
 [#]line __oline__ "configure"
 #include "confdefs.h"
-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+#ifdef __cplusplus
 #include <cstdlib>
 #endif
-])dnl
 [$1]
 EOF
 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
Index: src/libcwd/configure.in
diff -u src/libcwd/configure.in:1.91 src/libcwd/configure.in:1.92
--- src/libcwd/configure.in:1.91	Sat Jan  5 20:24:38 2002
+++ src/libcwd/configure.in	Mon Jan  7 18:12:41 2002
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.91 $)dnl
+AC_REVISION($Revision: 1.92 $)dnl
 
 dnl General intialization of `autoconf' varaibles.
 dnl Ensure that the directory specified with --srcdir was correct
@@ -458,8 +458,5 @@
 cd ..
 ])
 
-CW_OUTPUT(Makefile maintMakefile include/Makefile include/libcw/Makefile utils/Makefile tests/Makefile testsuite/Makefile include/libcw/debug_config.ho include/libcw/sysd.ho include/sys.ho libcwd.spec)
-exit 0
-
-dnl Keep automake happy
 AC_OUTPUT(Makefile maintMakefile include/Makefile include/libcw/Makefile utils/Makefile tests/Makefile testsuite/Makefile include/libcw/debug_config.ho include/libcw/sysd.ho include/sys.ho libcwd.spec)
+
----------------------- End of diff -----------------------