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

Libtool and Co removal

Browse Source
This commit is contained in:
aafemt 2009-02-19 21:10:46 +00:00
parent b5a256a3a7
commit e70b946e6c
3 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -1 +0,0 @@
ACLOCAL_AMFLAGS = -I m4

46
autogen.sh
View File

@ -15,14 +15,9 @@ if [ -z "$LIBTOOL" ]
then
LIBTOOL=libtool
fi
if [ -z "$LIBTOOLIZE" ]
then
LIBTOOLIZE=libtoolize
fi
echo "AUTOCONF="$AUTOCONF
echo "LIBTOOL="$LIBTOOL
echo "LIBTOOLiZE="$LIBTOOLIZE
AUTOHEADER=`echo $AUTOCONF |sed 's/conf/header/'`
VER=`$AUTOCONF --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
@ -37,21 +32,8 @@ case "$VER" in
;;
esac
VER=`$LIBTOOL --version|grep ' libtool)'|sed 's/.*) \([0-9][0-9.]*\) .*/\1/'`
case "$VER" in
0* | 1\.[0-2] | 1\.[0-2][a-z]* | \
1\.3\.[0-2] | 1\.3\.[0-2][a-z]* )
echo
echo "**Error**: You must have libtool 1.3.3 or later installed."
echo "Download the appropriate package for your distribution/OS,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/libtool/"
DIE=1
;;
esac
# Put other tests for programs here!
# If anything failed, exit now.
if test "$DIE" -eq 1; then
exit 1
@ -65,34 +47,6 @@ if test -z "$*" -a x$NOCONFIGURE = x; then
echo
fi
# For Ubuntu 8.10 - Intrepid Ibex
if [ ! -d m4 ]; then
mkdir m4
fi
# Generate configure from configure.in
echo "Running libtoolize ..."
LIBTOOL_M4=`$LIBTOOLIZE --copy --force --dry-run|grep 'You should add the contents of'|sed "s,^[^/]*\(/[^']*\).*$,\1,"`
if test "x$LIBTOOL_M4" != "x"; then
rm -f aclocal.m4
cp $LIBTOOL_M4 aclocal.m4
fi
TEMPFILE="./lt.out"
$LIBTOOLIZE --install --dry-run >$TEMPFILE 2>&1
LIBTOOL_AUX_FILES=`grep 'unrecognized option' $TEMPFILE`
rm -f $TEMPFILE
if test "x$LIBTOOL_AUX_FILES" != "x"; then
$LIBTOOLIZE --copy --force || exit 1
else
# libtoolize no longer installs config.guess and config.sub by default.
# Use new --install option to get old behavior.
$LIBTOOLIZE --copy --force --install || exit 1
fi
echo "Running autoreconf ..."
autoreconf -if
echo "Running autoheader ..."
$AUTOHEADER || exit 1

14
configure.in
View File

@ -4,7 +4,6 @@ AC_PREREQ(2.56)
AC_INIT(src)
AC_CONFIG_AUX_DIR(builds/make.new/config)
AC_CACHE_VAL(ac_cv_prog_make_set, [AC_PROG_MAKE_SET])
AC_CONFIG_MACRO_DIR([m4])
AC_PREFIX_DEFAULT(/usr/local/firebird)
AC_CONFIG_HEADER(src/include/gen/autoconfig.h:builds/make.new/config/config.h.in)
@ -455,11 +454,8 @@ AC_PROG_CXX
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
dnl EKU: AC_PROG_RANLIB has been superseded by AC_PROG_LIBTOOL
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
dnl Check for system header files
@ -552,6 +548,11 @@ if test "$RT_LIB_CHECK" = "true"; then
AC_CHECK_LIB(resolv, inet_aton)
fi
dnl Check for libraries for static C++ runtime linking
AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))
AC_CHECK_LIB(gcc_eh, main, XE_APPEND(-lgcc_eh, STATIC_CXXSUPPORT_LIB))
AC_SUBST(STATIC_CXXSUPPORT_LIB)
dnl check for INFINITY in math.h
dnl _ISOC99_SOURCE is defined to emulate C++ compilation in plain-C conftest.c
AC_TRY_COMPILE([#define _ISOC99_SOURCE 1
@ -1170,8 +1171,7 @@ case "$PLATFORM" in
AIX)
AIX_INSTALL_SRC_DIR=builds/install/arch-specific/aix/${FIREBIRD_ARCH_TYPE}
AC_CONFIG_FILES([
gen/install/scripts/rpmheader.aix.txt:${AIX_INSTALL_SRC_DIR}/rpmheader.txt.in
AC_CONFIG_FILES([gen/install/scripts/rpmheader.aix.txt:${AIX_INSTALL_SRC_DIR}/rpmheader.txt.in
gen/install/scripts/rpmfiles.aix.txt:${AIX_INSTALL_SRC_DIR}/rpmfiles.txt.in
gen/install/makeInstallImage.aix.sh:${AIX_INSTALL_SRC_DIR}/makeInstallImage.sh.in
gen/firebird/bin/preinstall.aix.sh:builds/install/arch-specific/aix/misc/preinstall.sh.in