firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

This variant works on all of: ancient MinGW's autotools,

Browse Source 
autotools, built from most fresh stable sources on ftp.gnu.org
and some middle case, installed on my box by default.
Also finished sinix-z cleanup.
This commit is contained in:
alexpeshkoff 2009-02-25 14:44:25 +00:00
parent 54e7ca538e
commit ec0d2640a0
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
autogen.sh
View File

@ -7,15 +7,18 @@ PKG_NAME=Firebird2
SRCDIR=`dirname $0`
DIE=0
if [ -z "$AUTOCONF" ]
if [ -z "$AUTORECONF" ]
then
AUTOCONF=autoconf
AUTORECONF=autoreconf
fi
echo "AUTOCONF="$AUTOCONF
AUTOHEADER=`echo $AUTOCONF |sed 's/conf/header/'`
echo "AUTORECONF="$AUTORECONF
VER=`$AUTOCONF --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
# This prevents calling automake in old autotools
AUTOMAKE=true
export AUTOMAKE
VER=`$AUTORECONF --version|grep '^[Aa]utoreconf'|sed 's/^[^0-9]*//'`
case "$VER" in
0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
2\.[1-4][0-9] | 2\.5[0-5][a-z]* )
@ -42,11 +45,8 @@ if test -z "$*" -a x$NOCONFIGURE = x; then
echo
fi
echo "Running autoheader ..."
$AUTOHEADER || exit 1
echo "Running autoconf ..."
$AUTOCONF || exit 1
echo "Running autoreconf ..."
$AUTORECONF --install --force --verbose || exit 1
# If NOCONFIGURE is set, skip the call to configure
if test "x$NOCONFIGURE" = "x"; then

18
configure.in
View File

@ -5,6 +5,10 @@ AC_INIT(src)
AC_CONFIG_AUX_DIR(builds/make.new/config)
AC_CACHE_VAL(ac_cv_prog_make_set, [AC_PROG_MAKE_SET])
AC_PREFIX_DEFAULT(/usr/local/firebird)
m4_ifdef([AC_CONFIG_MACRO_DIR],
[],
[m4_define([AC_CONFIG_MACRO_DIR], [])])
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(src/include/gen/autoconfig.h:builds/make.new/config/config.h.in)
@ -454,9 +458,10 @@ AC_PROG_CXX
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
dnl Check for system header files
AC_HEADER_DIRENT
@ -1203,15 +1208,6 @@ case "$PLATFORM" in
;;
SINIX-Z)
AC_CONFIG_FILES([gen/install/pkginfo:builds/install/arch-specific/sinixz/pkginfo.in
gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in
gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in
gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in
gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in]
,[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null])
;;
solx86|SOLARIS)
AC_CONFIG_FILES([gen/firebird/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
gen/firebird/install/Prototype:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in