diff options
| author | monty@hundin.mysql.fi <> | 2002-01-26 01:19:47 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-26 01:19:47 +0200 |
| commit | b9d3a55238c02baf8f4b088530e924934ecbf74c (patch) | |
| tree | 5ccc31c365805428193f80c2e7fe45e9c87a8173 /bdb | |
| parent | a880ec9423313c5397135883fb0b4b17fc7022db (diff) | |
| download | mariadb-git-b9d3a55238c02baf8f4b088530e924934ecbf74c.tar.gz | |
Update needed for SuSE 7.3
Update for autoconf 2.52
Diffstat (limited to 'bdb')
| -rw-r--r-- | bdb/dist/configure.in | 104 |
1 files changed, 53 insertions, 51 deletions
diff --git a/bdb/dist/configure.in b/bdb/dist/configure.in index d5196be9740..6656a588a66 100644 --- a/bdb/dist/configure.in +++ b/bdb/dist/configure.in @@ -21,9 +21,7 @@ AC_SUBST(ADDITIONAL_LANG) AC_SUBST(ADDITIONAL_LIBS) AC_SUBST(ADDITIONAL_OBJS) AC_SUBST(ADDITIONAL_PROGS) -AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) -AC_SUBST(CXX) AC_SUBST(CXXFLAGS) AC_SUBST(DBS_LIBS) AC_SUBST(DEFAULT_INSTALL) @@ -145,55 +143,6 @@ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; *qnx) AC_DEFINE(HAVE_QNX);; sco3.2v4*) CC=${CC-"cc -belf"} LIBS="-lsocket -lnsl_s $LIBS";; -sco3.2v5*) if test "$GCC" != "yes"; then - CFLAGS="$CFLAGS" - LD='$(CC) $(CFLAGS)' - LIBS="-lsocket -lnsl $LIBS" - CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" - case "$CFLAGS" in - *-belf*) - AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[ - case "$LDFLAGS" in - *-belf*) ;; - *) echo "Adding -belf option to ldflags." - LDFLAGS="$LDFLAGS -belf" - ;; - esac - ]) - ;; - *) - AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[ - case "$LDFLAGS" in - *-belf*) ;; - *) - echo "Adding -belf option to ldflags." - LDFLAGS="$LDFLAGS -belf" - ;; - esac - ]) - ;; - esac - else - CC="gcc" - LIBS="-lsocket -lnsl $LIBS" - CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" - fi - ;; -sysv5uw7*) LIBS="-lsocket -lnsl $LIBS" - if test "$GCC" != "yes"; then - # We are using built-in inline function - CC="cc -belf" - CXX="CC -belf" - CFLAGS="$CFLAGS -Kalloca -Kthread" - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" - LIBS="-Kthread -lsocket -lnsl $LIBS" - else - CFLAGS="$CFLAGS -Kalloca -pthread" - CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" - CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" - LIBS="-pthread -lsocket -lnsl $LIBS" - fi - ;; sco*) CC=${CC-"cc -belf"} LIBS="-lsocket -lnsl $LIBS";; solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; @@ -281,6 +230,59 @@ if test "$GXX" = "yes"; then esac fi +dnl Give the OS a last chance to override CFLAGS and LDFLAGS + +case "$host_os" in +sco3.2v5*) + if test "$GCC" != "yes"; then + CFLAGS="$CFLAGS" + LD='$(CC) $(CFLAGS)' + LIBS="-lsocket -lnsl $LIBS" + CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" + case "$CFLAGS" in + *-belf*) + AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[ + case "$LDFLAGS" in + *-belf*) ;; + *) echo "Adding -belf option to ldflags." + LDFLAGS="$LDFLAGS -belf" + ;; + esac + ]) + ;; + *) + AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[ + case "$LDFLAGS" in + *-belf*) ;; + *) + echo "Adding -belf option to ldflags." + LDFLAGS="$LDFLAGS -belf" + ;; + esac + ]) + ;; + esac + else + CC="gcc" + LIBS="-lsocket -lnsl $LIBS" + CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" + fi ;; +sysv5uw7*) LIBS="-lsocket -lnsl $LIBS" + if test "$GCC" != "yes"; then + # We are using built-in inline function + CC="cc -belf" + CXX="CC -belf -DNO_CPLUSPLUS_ALLOCA" + CFLAGS="$CFLAGS -Kalloca -Kthread" + LIBS="-Kthread -lsocket -lnsl $LIBS" + else + CFLAGS="$CFLAGS -Kalloca -pthread" + CXX="$CXX -DNO_CPLUSPLUS_ALLOCA" + CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS" + LIBS="-pthread -lsocket -lnsl $LIBS" + fi + ;; +esac + dnl Export our compiler preferences for the libtool configuration. export CC CCC CCC=CXX |