summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2015-05-13 21:23:24 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2015-05-14 00:19:32 +0200
commitf207a6d353c895c6078f8345340228a2a790a659 (patch)
treeb3cba2609d6f514602a538c044c84027604d0803
parent5e38b8439a48c5d3e7a9624336e1a4ae73049717 (diff)
downloadlvm2-f207a6d353c895c6078f8345340228a2a790a659.tar.gz
configure: preserve CXX/CFLAGS
AC_PROG_CC AC_PROG_CXX Does not preserve CFLAGS CXXFLAGS
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
2 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index 9babc5982..9485c2b5d 100755
--- a/configure
+++ b/configure
@@ -3184,6 +3184,8 @@ fi
test -n "$AWK" && break
done
+save_CFLAGS=$CFLAGS
+save_CXXFLAGS=$CXXFLAGS
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4230,6 +4232,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS
ac_ext=c
diff --git a/configure.in b/configure.in
index c3222ed2c..59337637e 100644
--- a/configure.in
+++ b/configure.in
@@ -69,8 +69,12 @@ esac
dnl -- Checks for programs.
AC_PROG_SED
AC_PROG_AWK
+save_CFLAGS=$CFLAGS
+save_CXXFLAGS=$CXXFLAGS
AC_PROG_CC
AC_PROG_CXX
+CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS
dnl probably no longer needed in 2008, but...
AC_PROG_GCC_TRADITIONAL