mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 08:40:39 -04:00
53 lines
1.9 KiB
Text
53 lines
1.9 KiB
Text
--- configure.in.orig 2007-09-04 15:51:12.000000000 +0800
|
|
+++ configure.in 2009-11-07 17:47:35.000000000 +0100
|
|
@@ -447,8 +447,9 @@
|
|
AC_CHECK_LIB(termcap, tgetent, , \
|
|
AC_CHECK_LIB(tinfo, tgetent, , \
|
|
AC_MSG_ERROR(termcap support not found)))))
|
|
- AC_SUBST(EDITLINE_A, -leditline)
|
|
+ AC_SUBST(EDITLINE_A, "-ledit -lreadline")
|
|
fi
|
|
+AM_PATH_ICU(3, 6)
|
|
|
|
|
|
dnl Check for functions
|
|
@@ -696,7 +696,7 @@
|
|
rm -f conftest*])
|
|
|
|
if test "$firebird_cv_gcc___thread" = yes; then
|
|
- AC_DEFINE(HAVE___THREAD, 1, [Define it if compiler supports ISO syntax for thread-local storage])
|
|
+dnl AC_DEFINE(HAVE___THREAD, 1, [Define it if compiler supports ISO syntax for thread-local storage])
|
|
fi
|
|
|
|
dnl ##################### DO NOT ADD ANY TESTS BELOW ###########################
|
|
@@ -720,6 +721,10 @@
|
|
AC_SUBST(NEW_FIREBIRD_DIR)
|
|
|
|
AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi), [Installation path prefix])
|
|
+AC_DEFINE_UNQUOTED(FB_EXEC_PREFIX, "$exec_prefix", [Executables path prefix])
|
|
+AC_DEFINE_UNQUOTED(FB_CONF_PREFIX, "$sysconfdir", [Single-machine data path prefix])
|
|
+AC_DEFINE_UNQUOTED(FB_MSG_PREFIX, "$datadir", [Architecture-independent data path prefix])
|
|
+AC_DEFINE_UNQUOTED(FB_LIBEXEC_PREFIX, "$libexecdir", [Program executables path prefix])
|
|
|
|
AC_CONFIG_COMMANDS(,,[
|
|
dnl # rebuild version header if needed
|
|
@@ -1048,19 +1053,11 @@
|
|
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
|
|
Makefile:Makefile.in
|
|
gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
|
|
-gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu
|
|
)
|
|
|
|
|
|
|
|
-if test "$PROD_BUILD_FLG" = N; then
|
|
- DEBUG_ICU=--enable-debug
|
|
-fi
|
|
-
|
|
AC_OUTPUT
|
|
-(cd extern/icu/source
|
|
-chmod +x runConfigureICU configure install-sh
|
|
-./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..)
|
|
|
|
|
|
dnl Print out the build configuration (the most interesting thing)
|