(AC_OUTPUT): Don't remove VPATH lines containing colons.

From Jim Meyering (meyering@comco.com).
(AC_LANG_C): Add CFLAGS to ac_cpp.
(AC_LANG_CPLUSPLUS): Add CXXFLAGS to ac_cpp.

diff --git a/acgeneral.m4 b/acgeneral.m4
index b2a7a5ad0ae36676c354cea98d9acb864c1b7615..8ffcb60045a9b3a7a89e20db2dca0eaef2597cf5 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -181,6 +181,7 @@ trap 'rm -fr confdefs* $ac_clean_files' 0
 if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi
 if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 
+dnl We use confdefs.h to avoid OS command line length limits that break DEFS.
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo > confdefs.h
@@ -372,13 +373,13 @@ dnl Which compiler do we use to run test checks?
 dnl
 define(AC_LANG_C,
 [define([AC_LANG],[C])AC_PROVIDE([$0])ac_ext=c
-ac_cpp='${CPP}'
+ac_cpp="${CPP} \$CFLAGS"
 ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
 ])dnl
 dnl
 define(AC_LANG_CPLUSPLUS,
 [define([AC_LANG],[CPLUSPLUS])AC_PROVIDE([$0])ac_ext=C
-ac_cpp='${CXXCPP}'
+ac_cpp="${CXXCPP} \$CXXFLAGS"
 ac_compile='${CXX-gcc} $CXXFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
 ])dnl
 dnl
@@ -664,8 +665,9 @@ s%^exec_prefix\\([  ]*\\)=\\([      ]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
 fi
 # Any assignment to VPATH causes Sun make to only execute
 # the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[        ]*VPATH[        ]*=[    ]*/d'
+  ac_vpsub='/^[        ]*VPATH[        ]*=[^:]*$/d'
 fi
 
 # Quote sed substitution magic chars in DEFS.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b2a7a5ad0ae36676c354cea98d9acb864c1b7615..8ffcb60045a9b3a7a89e20db2dca0eaef2597cf5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -181,6 +181,7 @@ trap 'rm -fr confdefs* $ac_clean_files' 0
 if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi
 if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 
+dnl We use confdefs.h to avoid OS command line length limits that break DEFS.
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo > confdefs.h
@@ -372,13 +373,13 @@ dnl Which compiler do we use to run test checks?
 dnl
 define(AC_LANG_C,
 [define([AC_LANG],[C])AC_PROVIDE([$0])ac_ext=c
-ac_cpp='${CPP}'
+ac_cpp="${CPP} \$CFLAGS"
 ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
 ])dnl
 dnl
 define(AC_LANG_CPLUSPLUS,
 [define([AC_LANG],[CPLUSPLUS])AC_PROVIDE([$0])ac_ext=C
-ac_cpp='${CXXCPP}'
+ac_cpp="${CXXCPP} \$CXXFLAGS"
 ac_compile='${CXX-gcc} $CXXFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
 ])dnl
 dnl
@@ -664,8 +665,9 @@ s%^exec_prefix\\([  ]*\\)=\\([      ]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
 fi
 # Any assignment to VPATH causes Sun make to only execute
 # the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[        ]*VPATH[        ]*=[    ]*/d'
+  ac_vpsub='/^[        ]*VPATH[        ]*=[^:]*$/d'
 fi
 
 # Quote sed substitution magic chars in DEFS.