* acgeneral.m4 (_AC_INIT_PREPARE_FDS): New macro, pulled out of

(_AC_INIT_PREPARE): here, where it is called from.
* aclang.m4 (_AC_PROG_CC_G, _AC_PROG_CXX_G): Don't test -z "`foo`".

diff --git a/ChangeLog b/ChangeLog
index bab855526b603a2c97cc347c0301c870eb140fa1..779d497b4d6c78fa1a21fd8c325de94ce42eb674 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-31  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_INIT_PREPARE_FDS): New macro, pulled out of
+       (_AC_INIT_PREPARE): here, where it is called from.
+       * aclang.m4 (_AC_PROG_CC_G, _AC_PROG_CXX_G): Don't test -z "`foo`".
+
 2000-07-31  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_DIVERT(INIT_PARSE_ARGS)): Rename as...

diff --git a/acgeneral.m4 b/acgeneral.m4
index a16bba0ee119889cc01db087cb6464b30ca81f26..d5dcc420c53f623ef3c2d44b1d4f995e562598bc 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1829,6 +1829,42 @@ AC_SHELL_UNSET([CDPATH], [:])
 ])
 
 
+# _AC_INIT_PREPARE_FDS
+# --------------------
+# Set up the file descriptors used by `configure'.
+
+define([AC_FD_MSG], 6)
+define([AC_FD_LOG], 5)
+# That's how it used to be named.
+AU_DEFUN([AC_FD_CC], [AC_FD_LOG])
+
+define([_AC_INIT_PREPARE_FDS],
+[# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+@%:@ AC_FD_MSG checking for... messages and results
+@%:@ AC_FD_LOG compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec AC_FD_MSG>/dev/null
+else
+  exec AC_FD_MSG>&1
+fi
+exec AC_FD_LOG>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by configure ifset([AC_PACKAGE_STRING],
+                            [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
+ > $[0] $ac_configure_args
+" >&AC_FD_LOG
+])# _AC_INIT_PREPARE_FDS
+
+
 # _AC_INIT_PREPARE
 # ----------------
 # Called by AC_INIT to build the preamble of the `configure' scripts.
@@ -1867,32 +1903,7 @@ dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
   # Get rid of the leading space.
 done
 
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-define([AC_FD_MSG], 6)dnl
-@%:@ AC_FD_MSG checking for... messages and results
-define([AC_FD_LOG], 5)dnl
-AU_DEFUN([AC_FD_CC], [AC_FD_LOG])dnl That's how it used to be named.
-@%:@ AC_FD_LOG compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec AC_FD_MSG>/dev/null
-else
-  exec AC_FD_MSG>&1
-fi
-exec AC_FD_LOG>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure ifset([AC_PACKAGE_STRING],
-                            [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
- > $[0] $ac_configure_args
-" >&AC_FD_LOG
+_AC_INIT_PREPARE_FDS
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h

diff --git a/aclang.m4 b/aclang.m4
index f7ba8fabb1d91eeccf5edce77e873f5b060e084d..73c3d675eaf6c421367ea6672f4598bb4a325e6e 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -616,7 +616,7 @@ ac_save_CFLAGS=$CFLAGS
 CFLAGS=
 AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CC-cc} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CC-cc} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=no
@@ -808,7 +808,7 @@ ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
 AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CXX-g++} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CXX-g++} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=no

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index f7ba8fabb1d91eeccf5edce77e873f5b060e084d..73c3d675eaf6c421367ea6672f4598bb4a325e6e 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -616,7 +616,7 @@ ac_save_CFLAGS=$CFLAGS
 CFLAGS=
 AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CC-cc} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CC-cc} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=no
@@ -808,7 +808,7 @@ ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
 AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CXX-g++} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CXX-g++} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=no

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index f7ba8fabb1d91eeccf5edce77e873f5b060e084d..73c3d675eaf6c421367ea6672f4598bb4a325e6e 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -616,7 +616,7 @@ ac_save_CFLAGS=$CFLAGS
 CFLAGS=
 AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CC-cc} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CC-cc} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=no
@@ -808,7 +808,7 @@ ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
 AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CXX-g++} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CXX-g++} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=no

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index a16bba0ee119889cc01db087cb6464b30ca81f26..d5dcc420c53f623ef3c2d44b1d4f995e562598bc 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1829,6 +1829,42 @@ AC_SHELL_UNSET([CDPATH], [:])
 ])
 
 
+# _AC_INIT_PREPARE_FDS
+# --------------------
+# Set up the file descriptors used by `configure'.
+
+define([AC_FD_MSG], 6)
+define([AC_FD_LOG], 5)
+# That's how it used to be named.
+AU_DEFUN([AC_FD_CC], [AC_FD_LOG])
+
+define([_AC_INIT_PREPARE_FDS],
+[# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+@%:@ AC_FD_MSG checking for... messages and results
+@%:@ AC_FD_LOG compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec AC_FD_MSG>/dev/null
+else
+  exec AC_FD_MSG>&1
+fi
+exec AC_FD_LOG>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by configure ifset([AC_PACKAGE_STRING],
+                            [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
+ > $[0] $ac_configure_args
+" >&AC_FD_LOG
+])# _AC_INIT_PREPARE_FDS
+
+
 # _AC_INIT_PREPARE
 # ----------------
 # Called by AC_INIT to build the preamble of the `configure' scripts.
@@ -1867,32 +1903,7 @@ dnl it's sensitive.  Putting any kind of quote in it causes syntax errors.
   # Get rid of the leading space.
 done
 
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-define([AC_FD_MSG], 6)dnl
-@%:@ AC_FD_MSG checking for... messages and results
-define([AC_FD_LOG], 5)dnl
-AU_DEFUN([AC_FD_CC], [AC_FD_LOG])dnl That's how it used to be named.
-@%:@ AC_FD_LOG compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec AC_FD_MSG>/dev/null
-else
-  exec AC_FD_MSG>&1
-fi
-exec AC_FD_LOG>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure ifset([AC_PACKAGE_STRING],
-                            [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
- > $[0] $ac_configure_args
-" >&AC_FD_LOG
+_AC_INIT_PREPARE_FDS
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index f7ba8fabb1d91eeccf5edce77e873f5b060e084d..73c3d675eaf6c421367ea6672f4598bb4a325e6e 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -616,7 +616,7 @@ ac_save_CFLAGS=$CFLAGS
 CFLAGS=
 AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CC-cc} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CC-cc} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=no
@@ -808,7 +808,7 @@ ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=
 AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-if test -z "`${CXX-g++} -g -c conftest.$ac_ext 2>&1`"; then
+if ${CXX-g++} -g -c conftest.$ac_ext 2>&1 | grep . >/dev/null 2>&1; then
   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=no