configure.ac (Firebird-3.0.2.32703-0.tar.bz2) | : | configure.ac (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 99 | skipping to change at line 99 | |||
MAKEFILE_PREFIX=darwin_x86_64 | MAKEFILE_PREFIX=darwin_x86_64 | |||
MAKEFILE_POSTFIX=darwin | MAKEFILE_POSTFIX=darwin | |||
PLATFORM=DARWIN | PLATFORM=DARWIN | |||
INSTALL_PREFIX=darwin | INSTALL_PREFIX=darwin | |||
AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | |||
XE_APPEND(-framework CoreFoundation,LIBS) | XE_APPEND(-framework CoreFoundation,LIBS) | |||
EDITLINE_FLG=Y | EDITLINE_FLG=Y | |||
SHRLIB_EXT=dylib | SHRLIB_EXT=dylib | |||
CPU_TYPE=x86_64 | CPU_TYPE=x86_64 | |||
EXPORT_SYMBOLS_STYLE=darwin | EXPORT_SYMBOLS_STYLE=darwin | |||
RAW_DEVICES_FLG=N | ||||
;; | ;; | |||
i*86-*-darwin*) | i*86-*-darwin*) | |||
MAKEFILE_PREFIX=darwin_i386 | MAKEFILE_PREFIX=darwin_i386 | |||
MAKEFILE_POSTFIX=darwin | MAKEFILE_POSTFIX=darwin | |||
PLATFORM=DARWIN | PLATFORM=DARWIN | |||
INSTALL_PREFIX=darwin | INSTALL_PREFIX=darwin | |||
AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | |||
XE_APPEND(-framework CoreFoundation,LIBS) | XE_APPEND(-framework CoreFoundation,LIBS) | |||
EDITLINE_FLG=Y | EDITLINE_FLG=Y | |||
SHRLIB_EXT=dylib | SHRLIB_EXT=dylib | |||
CPU_TYPE=i386 | CPU_TYPE=i386 | |||
EXPORT_SYMBOLS_STYLE=darwin | EXPORT_SYMBOLS_STYLE=darwin | |||
RAW_DEVICES_FLG=N | ||||
;; | ;; | |||
powerpc-*-darwin*) | powerpc-*-darwin*) | |||
MAKEFILE_PREFIX=darwin_powerpc | MAKEFILE_PREFIX=darwin_powerpc | |||
dnl MAKEFILE_PREFIX=darwin_ppc64 | dnl MAKEFILE_PREFIX=darwin_ppc64 | |||
MAKEFILE_POSTFIX=darwin | MAKEFILE_POSTFIX=darwin | |||
PLATFORM=DARWIN | PLATFORM=DARWIN | |||
INSTALL_PREFIX=darwin | INSTALL_PREFIX=darwin | |||
AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | AC_DEFINE(DARWIN, 1, [Define this if OS is DARWIN]) | |||
XE_APPEND(-framework CoreFoundation,LIBS) | XE_APPEND(-framework CoreFoundation,LIBS) | |||
skipping to change at line 898 | skipping to change at line 900 | |||
[Define this if getmntent needs second argument]) | [Define this if getmntent needs second argument]) | |||
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) | AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) | |||
fi | fi | |||
AC_CHECK_FUNCS(setrlimit getrlimit) | AC_CHECK_FUNCS(setrlimit getrlimit) | |||
AC_CHECK_FUNCS(tcgetattr strdup) | AC_CHECK_FUNCS(tcgetattr strdup) | |||
AC_CHECK_FUNCS(mkstemp) | AC_CHECK_FUNCS(mkstemp) | |||
AC_CHECK_FUNCS(pthread_keycreate pthread_key_create) | AC_CHECK_FUNCS(pthread_keycreate pthread_key_create) | |||
AC_CHECK_FUNCS(llrint) | AC_CHECK_FUNCS(llrint) | |||
AC_CHECK_FUNCS(localtime_r) | AC_CHECK_FUNCS(localtime_r) | |||
AC_CHECK_FUNCS(gmtime_r) | AC_CHECK_FUNCS(gmtime_r) | |||
AC_CHECK_FUNCS(ctime_r) | ||||
AC_CHECK_FUNCS(fchmod) | AC_CHECK_FUNCS(fchmod) | |||
AC_CHECK_FUNCS(semtimedop) | AC_CHECK_FUNCS(semtimedop) | |||
AC_CHECK_FUNCS(fegetenv) | AC_CHECK_FUNCS(fegetenv) | |||
AC_CHECK_FUNCS(strerror_r) | AC_CHECK_FUNCS(strerror_r) | |||
AC_CHECK_FUNCS(qsort_r) | AC_CHECK_FUNCS(qsort_r) | |||
case $host in | case $host in | |||
*-darwin*) | *-darwin*) | |||
ac_cv_func_fdatasync=no | ac_cv_func_fdatasync=no | |||
;; | ;; | |||
*) | *) | |||
AC_CHECK_FUNCS(fdatasync fsync) | AC_CHECK_FUNCS(fdatasync fsync) | |||
;; | ;; | |||
esac | esac | |||
AC_CHECK_FUNCS(poll) | AC_CHECK_FUNCS(poll) | |||
dnl AC_CHECK_FUNCS(AO_compare_and_swap_full) | dnl AC_CHECK_FUNCS(AO_compare_and_swap_full) | |||
AC_COMPILE_IFELSE( | AC_COMPILE_IFELSE( | |||
[AC_LANG_PROGRAM([[#include <atomic_ops.h>]], [[AO_T x; AO_compare_and_sw ap_full(&x, 0, 0); return 0;]])], | [AC_LANG_PROGRAM([[#include <atomic_ops.h>]], [[AO_T x; AO_compare_and_sw ap_full(&x, 0, 0); return 0;]])], | |||
AC_DEFINE(HAVE_AO_COMPARE_AND_SWAP_FULL, 1, [Define this if AO_compare_an d_swap_full() is defined in atomic_ops.h])) | AC_DEFINE(HAVE_AO_COMPARE_AND_SWAP_FULL, 1, [Define this if AO_compare_an d_swap_full() is defined in atomic_ops.h])) | |||
dnl Check for time function | dnl Check for time function | |||
AC_SEARCH_LIBS(clock_gettime, rt) | case $host in | |||
AC_CHECK_FUNCS(clock_gettime) | *-darwin*) | |||
ac_cv_func_clock_gettime=no | ||||
;; | ||||
*) | ||||
AC_SEARCH_LIBS(clock_gettime, rt) | ||||
AC_CHECK_FUNCS(clock_gettime) | ||||
;; | ||||
esac | ||||
dnl Checks for pthread functions | dnl Checks for pthread functions | |||
AC_CHECK_FUNCS(pthread_mutexattr_setprotocol) | AC_CHECK_FUNCS(pthread_mutexattr_setprotocol) | |||
AC_CHECK_FUNCS(pthread_mutexattr_setrobust_np) | AC_CHECK_FUNCS(pthread_mutexattr_setrobust_np) | |||
AC_CHECK_FUNCS(pthread_mutex_consistent_np) | AC_CHECK_FUNCS(pthread_mutex_consistent_np) | |||
AC_CHECK_FUNCS(pthread_rwlockattr_setkind_np) | AC_CHECK_FUNCS(pthread_rwlockattr_setkind_np) | |||
AC_CHECK_FUNCS(pthread_cancel) | AC_CHECK_FUNCS(pthread_cancel) | |||
AC_CHECK_FUNCS(pthread_atfork) | AC_CHECK_FUNCS(pthread_atfork) | |||
AC_CHECK_FUNCS(sigset) | AC_CHECK_FUNCS(sigset) | |||
skipping to change at line 1173 | skipping to change at line 1183 | |||
mkdir -p gen/\$fb_tgt/firebird/lib | mkdir -p gen/\$fb_tgt/firebird/lib | |||
mkdir -p gen/\$fb_tgt/firebird/misc | mkdir -p gen/\$fb_tgt/firebird/misc | |||
mkdir -p gen/\$fb_tgt/firebird/help | mkdir -p gen/\$fb_tgt/firebird/help | |||
mkdir -p gen/\$fb_tgt/firebird/plugins/udr | mkdir -p gen/\$fb_tgt/firebird/plugins/udr | |||
dnl ### TEMP ### directories for generated .cpp, .o and .d by module name | dnl ### TEMP ### directories for generated .cpp, .o and .d by module name | |||
for src_dir in `cd src; ls -R -1 * | grep : | tr -d : | tr "\n" " "; cd . .`; do | for src_dir in `cd src; ls -R -1 * | grep : | tr -d : | tr "\n" " "; cd . .`; do | |||
mkdir -p temp/\$fb_tgt/\$src_dir | mkdir -p temp/\$fb_tgt/\$src_dir | |||
done | done | |||
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do | ||||
mkdir -p temp/\$fb_tgt/\$src_dir | ||||
done | ||||
src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version | src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version | |||
dnl # sql files for UDF declarations | dnl # sql files for UDF declarations | |||
for sql_file in ib_udf.sql fbudf/fbudf.sql ib_udf2.sql; do | for sql_file in ib_udf.sql fbudf/fbudf.sql ib_udf2.sql; do | |||
cp src/extlib/\$sql_file gen/\$fb_tgt/firebird/UDF | cp src/extlib/\$sql_file gen/\$fb_tgt/firebird/UDF | |||
done | done | |||
done | done | |||
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do | ||||
mkdir -p temp/\$src_dir | ||||
done | ||||
dnl # rebuild version header if needed | dnl # rebuild version header if needed | |||
./src/misc/writeBuildNum.sh rebuildHeader | ./src/misc/writeBuildNum.sh rebuildHeader | |||
]) | ]) | |||
MAKE_SRC_DIR=builds/posix | MAKE_SRC_DIR=builds/posix | |||
dnl common files for all posix hosts | dnl common files for all posix hosts | |||
dnl TODO: fix "arch-specific/linux/" paths for common posix scripts with SVN | dnl TODO: fix "arch-specific/linux/" paths for common posix scripts with SVN | |||
for fb_tgt in $FB_TARGETS; do | for fb_tgt in $FB_TARGETS; do | |||
skipping to change at line 1334 | skipping to change at line 1344 | |||
AC_CONFIG_FILES( | AC_CONFIG_FILES( | |||
gen/make.rules:${MAKE_SRC_DIR}/make.rules | gen/make.rules:${MAKE_SRC_DIR}/make.rules | |||
gen/make.defaults:${MAKE_SRC_DIR}/make.defaults | gen/make.defaults:${MAKE_SRC_DIR}/make.defaults | |||
gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX} | gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX} | |||
gen/darwin.defaults:${MAKE_SRC_DIR}/darwin.defaults | gen/darwin.defaults:${MAKE_SRC_DIR}/darwin.defaults | |||
${POSTFIX_FILE} | ${POSTFIX_FILE} | |||
gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables | gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables | |||
gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets | gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets | |||
gen/Makefile:${MAKE_SRC_DIR}/Makefile.in | gen/Makefile:${MAKE_SRC_DIR}/Makefile.in | |||
gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples | gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples | |||
gen/examples/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examp les | gen/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples | |||
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in | gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in | |||
Makefile:Makefile.in | Makefile:Makefile.in | |||
) | ) | |||
if test "$STD_EDITLINE" = "false"; then | if test "$STD_EDITLINE" = "false"; then | |||
AC_CONFIG_FILES(gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.exter n.editline) | AC_CONFIG_FILES(gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.exter n.editline) | |||
fi | fi | |||
case "$PLATFORM" in | case "$PLATFORM" in | |||
SOLARIS | solx86 ) | SOLARIS | solx86 ) | |||
AC_CONFIG_FILES( | AC_CONFIG_FILES( | |||
End of changes. 7 change blocks. | ||||
7 lines changed or deleted | 17 lines changed or added |