diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 66 |
1 files changed, 43 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 955d535..af69a69 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,15 @@ AC_PREREQ(2.61) AC_INIT(Rasdaman, 8.0.0, baumann@rasdaman.com) RMANVERSION=8000 AM_INIT_AUTOMAKE() + +# Save original CFLAGS, CPPFLAGS, CXXFLAGS values. +orig_CFLAGS="$CFLAGS" +orig_CPPFLAGS="$CPPFLAGS" +orig_CXXFLAGS="$CXXFLAGS" +orig_LDFLAGS="$LDFLAGS" # Define CXXFLAGS before AC_PROG_CXX or it will automatically add -g -O2 on some systems +CFLAGS= +CPPFLAGS= CXXFLAGS= GCJFLAGS= @@ -209,7 +217,7 @@ AC_ARG_ENABLE([debug], AC_ARG_ENABLE([benchmark], [AS_HELP_STRING([--enable-benchmark], [this feature enables generation of binaries that contain extra code for benchmark output.])], - [CXXFLAGS+=-DRMANBENCHMARK ], + [AM_CPPFLAGS+=" -DRMANBENCHMARK"], []) AC_ARG_WITH([test-server], @@ -261,9 +269,8 @@ AS_IF([test "$with_default_basedb" == postgresql], EMBEDDEDSQLEXT="pgc" EMBEDDEDSQLOUT="cc" - BASEDBCXXFLAGS=" $POSTGRESQL_CFLAGS" - BASEDBLDFLAGS="$POSTGRESQL_LDFLAGS -lz -lecpg" - STATICBASEDBFLAGS="$BASEDBLDFLAGS" + BASEDB_CFLAGS=" $POSTGRESQL_CFLAGS" + BASEDB_LIBS="$POSTGRESQL_LDFLAGS -lz -lecpg" LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS" AC_PROG_ECPG @@ -295,14 +302,16 @@ fi AS_IF([test "x$RMANDEBUG" != x], [AC_DEFINE([RMANDEBUG]) AC_DEFINE([DEBUG]) - CXXFLAGS+=" -g" + AM_CFLAGS+=" -g" + AM_CXXFLAGS+=" -g" ], [ AC_DEFINE([__NO_MATH_INLINES]) - CXXFLAGS+=" -O2" + AM_CFLAGS+=" -O2" + AM_CXXFLAGS+=" -O2" ]) -CXXFLAGS+=" -fPIC" -CFLAGS+=" -fPIC" +AM_CXXFLAGS+=" -fPIC" +AM_CFLAGS+=" -fPIC" AC_DEFINE_UNQUOTED([RMANVERSION], [$RMANVERSION]) AC_DEFINE_UNQUOTED([BASEDBSTRING], ["$BASEDBSTRING"]) AC_DEFINE([EARLY_TEMPLATE]) @@ -313,19 +322,20 @@ AC_DEFINE([RASARCHITECTURE], ["X86"]) AC_DEFINE([RASSCHEMAVERSION], [5]) AC_DEFINE([NOPRE]) # if not on DEC Alpha -BASEDBLDFLAGS+=" -lnsl" -STATICBASEDBLDFLAGS+=" -lnsl" +BASEDB_LIBS+=" -lnsl" # endif AC_DEFINE([NO_in_addr_t]) -BASEDBCXXFLAGS+=" $DBIF_INC" +BASEDB_CPPFLAGS+=" $DBIF_INC" -CLIENTCXXFLAGS="$CXXFLAGS" -CLIENTLDFLAGS="$CXXLDFLAGS" +CLIENT_CPPFLAGS="$CPPFLAGS" +CLIENT_LDFLAGS="$LDFLAGS" +CPPFLAGS="" +LDFLAGS="" COMPDATE=`date +"%d.%m.%Y %H:%M:%S"` AC_DEFINE_UNQUOTED([COMPDATE], ["$COMPDATE"]) -CXXFLAGS+=" -I$abs_top_srcdir -I$abs_top_srcdir/debug -I$abs_top_srcdir/include" +AM_CPPFLAGS+=" -I$abs_top_srcdir -I$abs_top_srcdir/debug -I$abs_top_srcdir/include" # Our special install locations AC_SUBST([pkgdatadir], ["\${datadir}/\${RDM_SUBDIR}"]) @@ -346,10 +356,10 @@ AC_SUBST([rdmexecbindir], ["\${pkglibdir}/bin"]) AC_SUBST(EMBEDDEDSQLPRECOMPILER) AC_SUBST(EMBEDDEDSQLEXT) AC_SUBST(EMBEDDEDSQLOUT) -AC_SUBST(BASEDBCXXFLAGS) -AC_SUBST(BASEDBLDFLAGS) -AC_SUBST(CLIENTCXXFLAGS) -AC_SUBST(CLIENTLDFLAGS) +AC_SUBST(BASEDB_CPPFLAGS) +AC_SUBST(BASEDB_LIBS) +AC_SUBST(CLIENT_CPPFLAGS) +AC_SUBST(CLIENT_LIBS) AC_SUBST(DB2_INC) AC_SUBST(DB2_INSTANCEPATH) AC_SUBST(DB2_CPPLIBS) @@ -362,14 +372,24 @@ AC_SUBST(ORALDFLAGS) AC_SUBST(RASMGR_PORT) AC_SUBST(REL_STATIC_LIBS) AC_SUBST(RMANBASE) -AC_SUBST(STATICBASEDBFLAGS) AC_SUBST(logdir) #Directories used in the source-code -CXXFLAGS="$CXXFLAGS -DSHARE_DATA_DIR=\\\"\$(pkgdatadir)/\\\"" -CXXFLAGS="$CXXFLAGS -DCONFDIR=\\\"\$(sysconfdir)/\\\"" -CXXFLAGS="$CXXFLAGS -DBINDIR=\\\"\$(bindir)/\\\"" -CXXFLAGS="$CXXFLAGS -DLOGDIR=\\\"\$(logdir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DSHARE_DATA_DIR=\\\"\$(pkgdatadir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DCONFDIR=\\\"\$(sysconfdir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DBINDIR=\\\"\$(bindir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DLOGDIR=\\\"\$(logdir)/\\\"" + +AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_CPPFLAGS]) +AC_SUBST([AM_CXXFLAGS]) + +# Restore the flags with the user supplied values for proper +# substitution in the Makefile files. +CFLAGS="$orig_CFLAGS" +CPPFLAGS="$orig_CPPFLAGS" +CXXFLAGS="$orig_CXXFLAGS" +LDFLAGS="$orig_LDFLAGS" AC_OUTPUT |