From 2cbaaafed9c02951d4bf17f9c43ff71ac0821677 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 8 Jan 2009 14:35:48 +0200
Subject: [PATCH] Removed libtoolfix

---
 Makefile.ad               |  1 -
 configure.ad              | 23 +-------------
 lib/silccrypt/Makefile.ad |  9 +-----
 lib/silcsim/Makefile.ad   |  6 ----
 libtoolfix                | 63 ---------------------------------------
 5 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100755 libtoolfix

diff --git a/Makefile.ad b/Makefile.ad
index 7dd0be5a..87fd8145 100644
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -44,7 +44,6 @@ EXTRA_DIST = 		\
 	README.PLUGIN \
 #endif SILC_DIST_CLIENT
 #ifdef SILC_DIST_SILC
-	libtoolfix 	\
 	CREDITS
 #endif SILC_DIST_SILC
 
diff --git a/configure.ad b/configure.ad
index c99faef6..da37178d 100644
--- a/configure.ad
+++ b/configure.ad
@@ -1314,18 +1314,6 @@ without_irssi=false
 without_silcd=false
 #endif SILC_DIST_INPLACE
 
-libtoolfix=true
-AC_MSG_CHECKING(whether to do libtoolfix)
-AC_ARG_WITH(libtoolfix,
-  [  --without-libtoolfix    Do not fix libtool, for package builders],
-  [
-    AC_MSG_RESULT(no)
-    libtoolfix=false
-  ],
-  [
-    AC_MSG_RESULT(yes)
-  ])
-
 AC_SUBST(ETCDIR)
 AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR])
 #endif SILC_DIST_COMPILER
@@ -1356,16 +1344,6 @@ AC_SUBST(__SILC_HAVE_SIM)
 AC_SUBST(__SILC_ENABLE_DEBUG)
 AC_SUBST(__SILC_PACKAGE_VERSION)
 
-#
-# Fix the libtool to support run-time configuration.  This allows us
-# to in run-time specify when to compile shared/static libraries without
-# need to reconfigure the entire libtool.
-#
-if test x$libtoolfix = xtrue; then
-  ./libtoolfix $SILC_TOP_SRCDIR/ltmain.sh
-fi
-AM_CONDITIONAL(SILC_LIBTOOLFIX, test x$libtoolfix = xtrue)
-
 INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
 AC_SUBST(INCLUDE_DEFINES_INT)
 
@@ -1405,6 +1383,7 @@ tutorial/Makefile.defines_int
 AC_OUTPUT
 
 #ifdef SILC_DIST_COMPILER
+
 s_bindir=`eval echo $bindir`;s_bindir=`eval echo $s_bindir`
 s_sbindir=`eval echo $sbindir`;s_sbindir=`eval echo $s_sbindir`
 s_mandir=`eval echo $mandir`;s_mandir=`eval echo $s_mandir`
diff --git a/lib/silccrypt/Makefile.ad b/lib/silccrypt/Makefile.ad
index 19031662..a90afb55 100644
--- a/lib/silccrypt/Makefile.ad
+++ b/lib/silccrypt/Makefile.ad
@@ -47,14 +47,7 @@ libsilccrypt_la_SOURCES = 	\
 	silcpkcs1.c		\
 	silcpk.c
 
-if SILC_LIBTOOLFIX
-# Tell libtool to compile silccrypt as shared since silcsim will need it.
-LTFLAGS = --libtool-enable-shared
-else
-LTFLAGS =
-endif
-
-CFLAGS = $(LTFLAGS) @SILC_CRYPTO_CFLAGS@
+CFLAGS = @SILC_CRYPTO_CFLAGS@
 
 #ifdef SILC_DIST_TOOLKIT
 include_HEADERS =		\
diff --git a/lib/silcsim/Makefile.ad b/lib/silcsim/Makefile.ad
index e0b3fb25..b7d67fd9 100644
--- a/lib/silcsim/Makefile.ad
+++ b/lib/silcsim/Makefile.ad
@@ -49,12 +49,6 @@ if SILC_SIM
 all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
 endif
 
-if SILC_LIBTOOLFIX
-LTFLAGS = --libtool-enable-shared
-else
-LTFLAGS =
-endif
-
 $(SIM_CIPHER_OBJS):
 	@if test '!' -f lib$*.la ; then \
 	  $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
diff --git a/libtoolfix b/libtoolfix
deleted file mode 100755
index 45d582f7..00000000
--- a/libtoolfix
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# No Copyright 2002 Pekka Riikonen <priikone@silcnet.org>
-#
-# This script fixes the fundamental problem of libtool: it is not 
-# configurable in run-time.  This changes the libtool so that it becomes
-# more generic and configurable in run-time.
-#
-# New command line options to libtool:
-#
-# --libtool-enable-shared	Enable shared library compilation
-# --libtool-enable-static	Enable static library compilation
-# --libtool-disable-shared	Disable shared library compilation
-# --libtool-disable-static	Disable static library compilation
-#
-# If options are omitted the default libtool configuration will apply.
-#
-
-# Sanity checks
-if test '!' -f ./libtool; then
-  echo "./libtool does not exist"
-  exit 0
-fi
-
-# Take configuration from the ./libtool
-sed '/^# ltmain\.sh/q' ./libtool >./libtool.tmp
-
-# Put our wrapper to the new libtool.  This allows the run-time
-# configuration of the libtool.
-ltmain=`pwd`/ltmain.sh
-cat << EOF >> ./libtool.tmp
-args=\`echo \$*\`
-cargs=\`echo \$* | sed -e '/--libtool-enable-shared/s///' -e '/--libtool-enable-static/s///' -e '/--libtool-disable-shared/s///' -e '/--libtool-disable-static/s///'\`
-for i in \$args
-do
-  if test "\$i" = "--libtool-enable-shared"; then
-    build_libtool_libs=yes
-    fast_install=yes
-    continue
-  fi
-  if test "\$i" = "--libtool-disable-shared"; then
-    build_libtool_libs=no
-    continue
-  fi
-  if test "\$i" = "--libtool-enable-static"; then
-    build_old_libs=yes
-    continue
-  fi
-  if test "\$i" = "--libtool-disable-static"; then
-    build_old_libs=no
-    continue
-  fi
-done
-if test "\$cargs" = ""; then
-  cargs="--silent"
-fi
-. $ltmain \$cargs
-EOF
-
-mv -f ./libtool.tmp ./libtool
-chmod +x ./libtool
-
-exit 1
-- 
2.24.0