From e70b946e6c0c9b12d6476f913a22e7aff89f169b Mon Sep 17 00:00:00 2001
From: aafemt <aafemt@users.sourceforge.net>
Date: Thu, 19 Feb 2009 21:10:46 +0000
Subject: [PATCH] Libtool and Co removal

---
 Makefile.am  |  1 -
 autogen.sh   | 46 ----------------------------------------------
 configure.in | 14 +++++++-------
 3 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index cd8c1fa881..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index f1dd322e56..733d66b698 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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
 
diff --git a/configure.in b/configure.in
index f222a0c332..28a3587b43 100644
--- a/configure.in
+++ b/configure.in
@@ -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