diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index f0bc516fc0..c5257300f7 100644 --- a/configure.ac +++ b/configure.ac @@ -31,15 +31,35 @@ AM_INIT_AUTOMAKE(gnuradio,3.2svn) DEFINES="" AC_SUBST(DEFINES) +dnl Remember if the user explicity set CFLAGS +if test -n "${CFLAGS}"; then + user_set_cflags=yes +fi dnl Remember if the user explicity set CXXFLAGS if test -n "${CXXFLAGS}"; then user_set_cxxflags=yes fi + LF_CONFIGURE_CC LF_CONFIGURE_CXX GR_LIB64 dnl check for lib64 suffix after choosing compilers + +dnl The three macros above are known to override CFLAGS if the user +dnl didn't specify them. Though I'm sure somebody thought this was +dnl a good idea, it makes it hard to use other than -g -O2 when compiling +dnl selected files. Thus we "undo" the damage here... +dnl +dnl If the user specified CFLAGS, we use them. +dnl See Makefile.common for the rest of the magic. +if test "$user_set_cflags" != yes; then + autoconf_default_CFLAGS="$CFLAGS" + CFLAGS="" +fi +AC_SUBST(autoconf_default_CFLAGS) + + dnl The three macros above are known to override CXXFLAGS if the user dnl didn't specify them. Though I'm sure somebody thought this was dnl a good idea, it makes it hard to use other than -g -O2 when compiling @@ -50,6 +70,7 @@ dnl the output of swig use use -O1 if we're using g++. dnl See Makefile.common for the rest of the magic. if test "$user_set_cxxflags" != yes; then autoconf_default_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="" if test "$GXX" = yes; then case "$host_cpu" in powerpc*) @@ -66,7 +87,6 @@ fi AC_SUBST(autoconf_default_CXXFLAGS) AC_SUBST(swig_CXXFLAGS) - dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH if test x${PKG_CONFIG_PATH} = x; then PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig @@ -75,7 +95,7 @@ else fi export PKG_CONFIG_PATH - +LF_SET_WARNINGS GR_SET_GPROF GR_SET_PROF AM_PROG_AS @@ -114,8 +134,6 @@ AC_CHECK_LIB(socket,socket) dnl check for omnithreads (will soon be removed) GR_OMNITHREAD -CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" dnl Set the c++ compiler that we use for the build system when cross compiling if test x$CXX_FOR_BUILD = x @@ -344,11 +362,6 @@ AC_CONFIG_FILES([\ dnl run_tests.sh is created from run_tests.sh.in . Make it executable. AC_CONFIG_COMMANDS([run_tests_build], [chmod +x run_tests.sh]) -dnl Enable warnings as the last thing before generating output, since -dnl this may add -Werror to CFLAGS which can cause various configure -dnl checks to fail. -LF_SET_WARNINGS - AC_OUTPUT echo |