From 526c1c8dcb1db7f47ea7087bc565163f2dce86d3 Mon Sep 17 00:00:00 2001 From: skywalker Date: Mon, 29 Jul 2002 15:43:24 +0000 Subject: [PATCH] Changed to work with super build as well as classic. The makefile now come from builds/posix rather than src/make.new --- configure.in | 208 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 164 insertions(+), 44 deletions(-) diff --git a/configure.in b/configure.in index cd3f64b3cf..549e923f02 100644 --- a/configure.in +++ b/configure.in @@ -17,9 +17,23 @@ AC_PROG_LEX AC_PROG_LN_S AC_PROG_RANLIB AC_PROG_YACC + +FIREBIRD_ARCH_TYPE=super +#FIREBIRD_ARCH_TYPE=super +AC_SUBST(FIREBIRD_ARCH_TYPE) + +if `test "$FIREBIRD_ARCH_TYPE" = "super"` + then + SUPERSERVER_DEF="-DSUPERSERVER" + AC_SUBST(SUPERSERVER_DEF) +fi +PROD_BUILD_FLG= +#PROD_BUILD_FLG=Y +AC_SUBST(PROD_BUILD_FLG) AC_CHECK_HEADERS(assert.h) -AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(ctype.h) +AC_CHECK_HEADERS(errno.h) AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(grp.h) AC_CHECK_HEADERS(pwd.h) @@ -36,14 +50,15 @@ AC_CHECK_HEADERS(sys/time.h) AC_CHECK_HEADERS(sys/timeb.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/ioctl.h) -AC_CHECK_HEADERS(varargs.h) +AC_CHECK_HEADERS(setjmp.h) AC_CHECK_HEADERS(stdarg.h) AC_CHECK_HEADERS(stdlib.h) -AC_CHECK_HEADERS(ctype.h) AC_CHECK_HEADERS(string.h) AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(readline/readline.h) AC_CHECK_HEADERS(pwd.h) +AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(varargs.h) AC_MSG_CHECKING(Checking for socklen_t type) AC_TRY_COMPILE([#include @@ -57,6 +72,11 @@ AC_TRY_COMPILE([#include AC_CHECK_LIB(dl, main) AC_CHECK_LIB(c,main) AC_CHECK_LIB(m, main) +if `test "$FIREBIRD_ARCH_TYPE" = "super"` + then + AC_CHECK_LIB(pthread, main) +fi + AC_CHECK_LIB(crypt, main) AC_CHECK_LIB(curses, main) #AC_CHECK_LIB(termcap, main) @@ -84,14 +104,6 @@ esac AC_SUBST(PLATFORM) -FIREBIRD_ARCH_TYPE=classic -#FIREBIRD_ARCH_TYPE=super -AC_SUBST(FIREBIRD_ARCH_TYPE) - -PROD_BUILD_FLG= -#PROD_BUILD_FLG=Y -AC_SUBST(PROD_BUILD_FLG) - CPU_TYPE=$host_cpu AC_SUBST(CPU_TYPE) @@ -104,9 +116,9 @@ AC_DEFINE(UNIX_64_BIT_IO) FIREBIRD_PACKAGE_VERSION="0a.Dev1" -FIREBIRD_LIBGDS_SO=libgds.so.${FIREBIRD_VERSION} -FIREBIRD_LIBGDS_SO_LNK=libgds.so -FIREBIRD_LIBGDS_SO_X_LNK=libgds.so.${MajorVer} +FIREBIRD_LIBGDS_SO=libfbembed.so.${FIREBIRD_VERSION} +FIREBIRD_LIBGDS_SO_LNK=libfbembed.so +FIREBIRD_LIBGDS_SO_X_LNK=libfbembed.so.${MajorVer} AC_SUBST(FIREBIRD_LIBGDS_SO) AC_SUBST(FIREBIRD_LIBGDS_SO_LNK) @@ -137,7 +149,10 @@ AC_SUBST(NEW_FIREBIRD_DIR) - +# These AC_OUTPUT_COMMANDS should be replaced by AC_CONFIG_COMMANDS_PRE +# by that version of autoconf is fresh off the shelf, and for now although +# these cause an error it's acceptable. +# AC_OUTPUT_COMMANDS([mkdir -p gen/csv]) AC_OUTPUT_COMMANDS([mkdir -p gen/dudley]) AC_OUTPUT_COMMANDS([mkdir -p gen/isql]) @@ -186,36 +201,141 @@ AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/darwin]) AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/posix]) AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/win32]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbcommon]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbcommon/memory]) +#AC_OUTPUT_COMMANDS([mkdir -p gen/libdsqlserver]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/dsql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/lock]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/pipe]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/wal]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/common/memory]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbserver/jrd/os/posix]) +AC_OUTPUT_COMMANDS([mkdir -p gen/fbserver/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/dsql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbclient/common/memory]) +AC_OUTPUT_COMMANDS([mkdir -p gen/client.gbak/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/client.gfix/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/client.gpre/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/client.isql/isql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/client.util/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/intl/intl]) + +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbcommon/common/memory]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbcommon/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/boot.gpre/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/boot.gpre/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/dsql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/lock]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/pipe]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/jrd/os/posix]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gpre/wal]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.gbak/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/static.isql/isql]) + + + +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/dsql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/lock]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/pipe]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/jrd/os/posix]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbstatic/wal]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.lockmgr/lock]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.util/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.gbak/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.gfix/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.isql/isql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.gdef/dudley]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.qli/qli]) +AC_OUTPUT_COMMANDS([mkdir -p gen/embed.gpre/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/inet_server/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/msgs/msgs]) +AC_OUTPUT_COMMANDS([mkdir -p gen/extlib/extlib/fbudf]) +AC_OUTPUT_COMMANDS([mkdir -p gen/v5_examples/v5_examples]) + + +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/jrd]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/dsql]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/lock]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/remote]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/pipe]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/gpre]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/alice]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/utilities]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/fbutil]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/jrd/os/posix]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/burp]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/wal]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/common/memory]) +AC_OUTPUT_COMMANDS([mkdir -p gen/libfbembed/fbutil]) + +MAKE_SRC_DIR=builds/posix + AC_OUTPUT( \ -src/make.rules:src/make.new/make.rules \ -src/make.defaults:src/make.new/make.defaults \ -src/make.platform:src/make.new/prefix.${MAKEFILE_PREFIX} \ -src/make.shared.variables:src/make.new/make.shared.variables \ -src/fbutil/Makefile:src/make.new/Makefile.in.fbutil \ -src/alice/Makefile:src/make.new/Makefile.in.alice \ -src/burp/Makefile:src/make.new/Makefile.in.burp \ -src/csv/Makefile:src/make.new/Makefile.in.csv \ -src/refDatabases/Makefile:src/make.new/Makefile.in.refDatabases \ -src/dsql/Makefile:src/make.new/Makefile.in.dsql \ -src/dudley/Makefile:src/make.new/Makefile.in.dudley \ -src/v5_examples/Makefile:src/make.new/Makefile.in.example5 \ -src/extlib/Makefile:src/make.new/Makefile.in.extlib \ -src/extlib/fbudf/Makefile:src/make.new/Makefile.in.fbudf \ -src/gpre/Makefile:src/make.new/Makefile.in.gpre \ -src/intl/Makefile:src/make.new/Makefile.in.intl \ -src/isql/Makefile:src/make.new/Makefile.in.isql \ -src/journal/Makefile:src/make.new/Makefile.in.journal \ -src/jrd/Makefile:src/make.new/Makefile.in.jrd \ -src/lock/Makefile:src/make.new/Makefile.in.lock \ -src/msgs/Makefile:src/make.new/Makefile.in.msgs \ -src/pipe/Makefile:src/make.new/Makefile.in.pipe \ -src/qli/Makefile:src/make.new/Makefile.in.qli \ -src/remote/Makefile:src/make.new/Makefile.in.remote \ -src/utilities/Makefile:src/make.new/Makefile.in.utilities \ -src/wal/Makefile:src/make.new/Makefile.in.wal \ -src/common/memory/Makefile:src/make.new/Makefile.in.common.memory \ -src/install/Makefile:src/make.new/Makefile.in.install \ -src/Makefile:src/make.new/Makefile.in.firebird \ +gen/make.rules:${MAKE_SRC_DIR}/make.rules \ +gen/make.defaults:${MAKE_SRC_DIR}/make.defaults \ +gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX} \ +gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables \ +src/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird \ +gen/Makefile.libfbcommon:${MAKE_SRC_DIR}/Makefile.in.libfbcommon \ +gen/Makefile.boot.gpre:${MAKE_SRC_DIR}/Makefile.in.boot.gpre \ +gen/Makefile.libfbstatic:${MAKE_SRC_DIR}/Makefile.in.libfbstatic \ +gen/Makefile.static.gpre:${MAKE_SRC_DIR}/Makefile.in.static.gpre \ +gen/Makefile.static.gbak:${MAKE_SRC_DIR}/Makefile.in.static.gbak \ +gen/Makefile.static.isql:${MAKE_SRC_DIR}/Makefile.in.static.isql \ +gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases \ +gen/Makefile.libfbserver:${MAKE_SRC_DIR}/Makefile.in.libfbserver \ +gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver \ +gen/Makefile.libfbclient:${MAKE_SRC_DIR}/Makefile.in.libfbclient \ +gen/Makefile.client.gbak:${MAKE_SRC_DIR}/Makefile.in.client.gbak \ +gen/Makefile.client.gfix:${MAKE_SRC_DIR}/Makefile.in.client.gfix \ +gen/Makefile.client.isql:${MAKE_SRC_DIR}/Makefile.in.client.isql \ +gen/Makefile.client.gpre:${MAKE_SRC_DIR}/Makefile.in.client.gpre \ +gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util \ +gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl \ +gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs \ +gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib \ +gen/Makefile.v5_examples:${MAKE_SRC_DIR}/Makefile.in.v5_examples \ +gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed \ +gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server \ +gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr \ +gen/Makefile.embed.util:${MAKE_SRC_DIR}/Makefile.in.embed.util \ +gen/Makefile.embed.gfix:${MAKE_SRC_DIR}/Makefile.in.embed.gfix \ +gen/Makefile.embed.gbak:${MAKE_SRC_DIR}/Makefile.in.embed.gbak \ +gen/Makefile.embed.isql:${MAKE_SRC_DIR}/Makefile.in.embed.isql \ +gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef \ +gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli \ +gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre \ +src/v5_examples/Makefile:${MAKE_SRC_DIR}/Makefile.in.example5 \ +src/install/Makefile:${MAKE_SRC_DIR}/Makefile.in.install \ Makefile:Makefile.in \ gen/install/scripts/preinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preinstall.sh.in \ gen/install/scripts/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/install.sh.in \