Added --wihtout-libtoolfix.

diff --git a/CHANGES b/CHANGES
index 3098057645ea6aa2a7a03060df39b26159aa4138..4698a724a1b0ebb972b81718c48e5323ffd6a3ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Fri Dec  6 17:40:24 EET 2002  Pekka Riikonen <priikone@silcnet.org>
        * GETKEY to update the client entrys fingerprint too.
          Affected file lib/silcclient/command_reply.c.
 
+       * Added --without-libtoolfix for package builders using weird
+         wrappers around libtool (BSD at least).
+
 Thu Dec  5 22:29:46 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed backup router bugs:  When backup resumes router and

diff --git a/configure.in.pre b/configure.in.pre
index c8161875f01d4c3973431a0c663f0ad55c6bc151..9c9aa9697c9919fadad87525649114ee1821396d 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -997,6 +997,22 @@ AC_ARG_WITH(silcd,
     AC_MSG_RESULT(yes)
   ])
 
+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")
+
+
 
 ##
 ##  Misc
@@ -1031,7 +1047,11 @@ AC_SUBST(SILC_DIST_SUBDIRS)
 # to in run-time specify when to compile shared/static libraries without
 # need to reconfigure the entire libtool.
 #
-./libtoolfix $SILC_TOP_SRCDIR/ltmain.sh
+if test x$libtoolfix = xtrue; then
+  ./libtoolfix $SILC_TOP_SRCDIR/ltmain.sh
+fi
+AM_CONDITIONAL(SILC_LIBTOOLFIX, test x$libtoolfix = xtrue)
+
 
 #
 # Makefile outputs

diff --git a/lib/silccrypt/Makefile.am b/lib/silccrypt/Makefile.am
index d158c3ae20fc8d072b2b1ba71b7f84a688c30aeb..47f7204491e8e6810f2b9556744055b1bb07944b 100644 (file)
--- a/lib/silccrypt/Makefile.am
+++ b/lib/silccrypt/Makefile.am
@@ -38,8 +38,14 @@ libsilccrypt_la_SOURCES = \
        silcpkcs.c \
        pkcs1.c
 
+if SILC_LIBTOOLFIX
 # Tell libtool to compile silccrypt as shared since silcsim will need it.
-CFLAGS = --libtool-enable-shared
+LTFLAGS = --libtool-enable-shared
+else
+LTFLAGS = 
+endif
+
+CFLAGS = $(LTFLAGS)
 
 if SILC_DIST_TOOLKIT
 include_HEADERS =      \

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 6fed677471c96eaf1f454b9795acbff422d574b0..3e45d3d7521ff8b513100b8bd6570ad39613957b 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -52,10 +52,16 @@ 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) \
-               ../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \
+               ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
          cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
                $(srcdir)/$*.sim.so; \
        fi
@@ -63,7 +69,7 @@ $(SIM_CIPHER_OBJS):
 $(SIM_HASH_OBJS):
        @if test '!' -f lib$*.la ; then \
          $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
-               ../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \
+               ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
          cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
                $(srcdir)/$*.sim.so; \
        fi