* acgeneral.m4: Formatting changes.

* acspecific.m4: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 29229cd0c5847bde0fa08ec0be4995945425242a..8a4e22776f37cb563b173d4029ed0bcd44818ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-07  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4: Formatting changes.
+       * acspecific.m4: Likewise.
+
 2000-02-07  Akim Demaille  <akim@epita.fr>
 
        Start a new series of tests which check the semantics.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 95fe457dbe37f3e84a851d239497f95ae9bed98b..ec908d2ed08692c84eefdc8cd36a9b4e9a1f7f4d 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1806,24 +1806,23 @@ dnl If the cache file is inconsistent with the current host,
 dnl target and build system types, execute CMD or print a default
 dnl error message.
 AC_DEFUN(AC_VALIDATE_CACHED_SYSTEM_TUPLE,
-[
-  AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-  AC_MSG_CHECKING([cached system tuple])
-  if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-       test x"$ac_cv_host_system_type" != x"$host"; } ||
-     { test x"${ac_cv_build_system_type+set}" = x"set" &&
-       test x"$ac_cv_build_system_type" != x"$build"; } ||
-     { test x"${ac_cv_target_system_type+set}" = x"set" &&
-       test x"$ac_cv_target_system_type" != x"$target"; }; then
-      AC_MSG_RESULT([different])
-      ifelse($#, 1, [$1],
-        [AC_MSG_ERROR([remove config.cache and re-run configure])])
-  else
-    AC_MSG_RESULT(ok)
-  fi
-  ac_cv_host_system_type="$host"
-  ac_cv_build_system_type="$build"
-  ac_cv_target_system_type="$target"
+[AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+AC_MSG_CHECKING([cached system tuple])
+if { test x"${ac_cv_host_system_type+set}" = x"set" &&
+     test x"$ac_cv_host_system_type" != x"$host"; } ||
+   { test x"${ac_cv_build_system_type+set}" = x"set" &&
+     test x"$ac_cv_build_system_type" != x"$build"; } ||
+   { test x"${ac_cv_target_system_type+set}" = x"set" &&
+     test x"$ac_cv_target_system_type" != x"$target"; }; then
+    AC_MSG_RESULT([different])
+    m4_default([$1],
+               [AC_MSG_ERROR([remove config.cache and re-run configure])])
+else
+  AC_MSG_RESULT(ok)
+fi
+ac_cv_host_system_type="$host"
+ac_cv_build_system_type="$build"
+ac_cv_target_system_type="$target"dnl
 ])
 
 
@@ -1866,7 +1865,8 @@ fi
 ])
 
 
-dnl AC_CACHE_SAVE()
+dnl AC_CACHE_SAVE
+dnl -------------
 define(AC_CACHE_SAVE,
 [cat >confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1906,9 +1906,7 @@ changequote(, )dnl
     ;;
   esac >>confcache
 changequote([, ])dnl
-if cmp -s $cache_file confcache; then
-  :
-else
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
     echo "updating cache $cache_file"
     cat confcache >$cache_file

diff --git a/acspecific.m4 b/acspecific.m4
index 2aa3fe5b4c030423c15805b8e3214c6cec520db8..7604649cf1e96e78150eae8cf5a62e46aad5a6ba 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -3029,6 +3029,9 @@ interpval="$ac_cv_sys_interpreter"
 
 AC_DEFUNCT(AC_HAVE_POUNDBANG, [;use AC_SYS_INTERPRETER, taking no arguments])
 
+
+dnl AC_SYS_LONG_FILE_NAMES
+dnl ----------------------
 AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
 [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names,
 [ac_cv_sys_long_file_names=yes

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 95fe457dbe37f3e84a851d239497f95ae9bed98b..ec908d2ed08692c84eefdc8cd36a9b4e9a1f7f4d 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1806,24 +1806,23 @@ dnl If the cache file is inconsistent with the current host,
 dnl target and build system types, execute CMD or print a default
 dnl error message.
 AC_DEFUN(AC_VALIDATE_CACHED_SYSTEM_TUPLE,
-[
-  AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-  AC_MSG_CHECKING([cached system tuple])
-  if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-       test x"$ac_cv_host_system_type" != x"$host"; } ||
-     { test x"${ac_cv_build_system_type+set}" = x"set" &&
-       test x"$ac_cv_build_system_type" != x"$build"; } ||
-     { test x"${ac_cv_target_system_type+set}" = x"set" &&
-       test x"$ac_cv_target_system_type" != x"$target"; }; then
-      AC_MSG_RESULT([different])
-      ifelse($#, 1, [$1],
-        [AC_MSG_ERROR([remove config.cache and re-run configure])])
-  else
-    AC_MSG_RESULT(ok)
-  fi
-  ac_cv_host_system_type="$host"
-  ac_cv_build_system_type="$build"
-  ac_cv_target_system_type="$target"
+[AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+AC_MSG_CHECKING([cached system tuple])
+if { test x"${ac_cv_host_system_type+set}" = x"set" &&
+     test x"$ac_cv_host_system_type" != x"$host"; } ||
+   { test x"${ac_cv_build_system_type+set}" = x"set" &&
+     test x"$ac_cv_build_system_type" != x"$build"; } ||
+   { test x"${ac_cv_target_system_type+set}" = x"set" &&
+     test x"$ac_cv_target_system_type" != x"$target"; }; then
+    AC_MSG_RESULT([different])
+    m4_default([$1],
+               [AC_MSG_ERROR([remove config.cache and re-run configure])])
+else
+  AC_MSG_RESULT(ok)
+fi
+ac_cv_host_system_type="$host"
+ac_cv_build_system_type="$build"
+ac_cv_target_system_type="$target"dnl
 ])
 
 
@@ -1866,7 +1865,8 @@ fi
 ])
 
 
-dnl AC_CACHE_SAVE()
+dnl AC_CACHE_SAVE
+dnl -------------
 define(AC_CACHE_SAVE,
 [cat >confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1906,9 +1906,7 @@ changequote(, )dnl
     ;;
   esac >>confcache
 changequote([, ])dnl
-if cmp -s $cache_file confcache; then
-  :
-else
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
     echo "updating cache $cache_file"
     cat confcache >$cache_file

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 2aa3fe5b4c030423c15805b8e3214c6cec520db8..7604649cf1e96e78150eae8cf5a62e46aad5a6ba 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -3029,6 +3029,9 @@ interpval="$ac_cv_sys_interpreter"
 
 AC_DEFUNCT(AC_HAVE_POUNDBANG, [;use AC_SYS_INTERPRETER, taking no arguments])
 
+
+dnl AC_SYS_LONG_FILE_NAMES
+dnl ----------------------
 AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
 [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names,
 [ac_cv_sys_long_file_names=yes