aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-03-07 01:13:03 +0000
committerYang Tse <yangsita@gmail.com>2007-03-07 01:13:03 +0000
commitd31feb8ff9b905ddf7a73a966676ea4f9c197b02 (patch)
treedca8e36256f81e921157b675e404ffabd4354b3d
parent4c3568bfd644e977cc6d56be6af56a29bea0cf5b (diff)
Autoconf redefines the M4 builtin macro 'm4_undefine' in such a way that
it fails if the macro that is being undefined is not already defined. To make this work under all cases and be sure that at a certain point some specific macro isn't defined we must use the following style in configure: m4_ifdef([macro], [m4_undefine([macro])])
-rw-r--r--ares/configure.ac4
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 0 deletions
diff --git a/ares/configure.ac b/ares/configure.ac
index 2d09dbacc..09eb4eae9 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -64,11 +64,15 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
)
dnl skip libtool C++ and Fortran compiler checks
+m4_ifdef([AC_PROG_CXX], [m4_undefine([AC_PROG_CXX])])
m4_defun([AC_PROG_CXX],[])
+m4_ifdef([AC_PROG_F77], [m4_undefine([AC_PROG_F77])])
m4_defun([AC_PROG_F77],[])
dnl skip libtool C++ and Fortran linker checks
+m4_ifdef([AC_LIBTOOL_CXX], [m4_undefine([AC_LIBTOOL_CXX])])
m4_defun([AC_LIBTOOL_CXX],[])
+m4_ifdef([AC_LIBTOOL_F77], [m4_undefine([AC_LIBTOOL_F77])])
m4_defun([AC_LIBTOOL_F77],[])
dnl libtool setup
diff --git a/configure.ac b/configure.ac
index b8a16f8e9..d54dd2fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,11 +116,15 @@ dnl support building of Windows DLLs
AC_LIBTOOL_WIN32_DLL
dnl skip libtool C++ and Fortran compiler checks
+m4_ifdef([AC_PROG_CXX], [m4_undefine([AC_PROG_CXX])])
m4_defun([AC_PROG_CXX],[])
+m4_ifdef([AC_PROG_F77], [m4_undefine([AC_PROG_F77])])
m4_defun([AC_PROG_F77],[])
dnl skip libtool C++ and Fortran linker checks
+m4_ifdef([AC_LIBTOOL_CXX], [m4_undefine([AC_LIBTOOL_CXX])])
m4_defun([AC_LIBTOOL_CXX],[])
+m4_ifdef([AC_LIBTOOL_F77], [m4_undefine([AC_LIBTOOL_F77])])
m4_defun([AC_LIBTOOL_F77],[])
dnl libtool setup