correct handling of c++ flags for c/cpp code
authorAlex Kirhenshtein <alk@netxms.org>
Thu, 5 Oct 2006 16:55:20 +0000 (16:55 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Thu, 5 Oct 2006 16:55:20 +0000 (16:55 +0000)
configure.ac
reconf

index 20ed851..093002f 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.195 2006-10-05 14:44:17 alk Exp $
+# $Id: configure.ac,v 1.196 2006-10-05 16:55:20 alk Exp $
 #
 # Process this file with autoconf to produce a configure script.
 #
@@ -32,22 +32,22 @@ SUBAGENT_LIBS=""
 AC_LANG_PUSH([C++])
 
 AC_MSG_CHECKING(whether C++ compiler accepts -fno-rtti)
-OLD_CPPFLGAS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -fno-rtti"
+OLD_CXXFLGAS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -fno-rtti"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ]])],
        [ AC_MSG_RESULT(yes) ], 
        [ 
-               CPPFLAGS="$OLD_CPPFLAGS"
+               CXXFLAGS="$OLD_CXXFLAGS"
                AC_MSG_RESULT(no)
        ])
 
 AC_MSG_CHECKING(whether C++ compiler accepts -fno-exceptions)
-OLD_CPPFLGAS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -fno-exceptions"
+OLD_CXXFLGAS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -fno-exceptions"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ]])],
        [ AC_MSG_RESULT(yes) ], 
        [ 
-               CPPFLAGS="$OLD_CPPFLAGS"
+               CXXFLAGS="$OLD_CXXFLAGS"
                AC_MSG_RESULT(no)
        ])
 
diff --git a/reconf b/reconf
index 77774ca..c2936c3 100644 (file)
--- a/reconf
+++ b/reconf
@@ -34,6 +34,12 @@ fi
 mkdir -p config
 touch README
 
+echo \*\*\* ACLOCAL: `which $ACLOCAL`
+echo \*\*\* AUTOCONF: `which $AUTOCONF`
+echo \*\*\* AUTOHEADER: `which $AUTOHEADER`
+echo \*\*\* AUTOMAKE: `which $AUTOMAKE`
+echo \*\*\* LIBTOOLIZE: `which $LIBTOOLIZE`
+
 rm -f config.cache &&
 [ ! -f config/ltmain.sh ] && $LIBTOOLIZE
 echo "- aclocal." &&