Tue Apr 10 12:40:19 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

	* Only pass -rpath to libtool when building shared libraries.
	  Affected file lib/Makefile.ad
	* Removing the stray "s" in configure.ad

diff --git a/CHANGES b/CHANGES
index b013f6b2f851838d68cdfc1cc6c7f1d63a682d4c..337bc818b26d12f047c9372119bb466fbeeb8b16 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Tue Apr 10 12:40:19 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
+
+       * Only pass -rpath to libtool when building shared libraries.
+         Affected file lib/Makefile.ad
+       * Removing the stray "s" in configure.ad
+
 Sat Mar 24 19:13:58 CET 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Redraw the screen after creating a new key.  Affected file

diff --git a/configure.ad b/configure.ad
index 3282af2a73ff404fba88d54880310afb6a6fc13c..a303d5c4f8b59b1d74f0582739bc75c62fe4bb88 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -4,7 +4,7 @@
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
 #  Copyright (C) 2000 - 2007 Pekka Riikonen
-s#
+#
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; version 2 of the License.

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 47844fa609a779b2c84fac83897de4f211a040e8..94234745f84c58b562ff13daa7d8ee8a3b8a32ea 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -49,6 +49,12 @@ SILCLIB_DIRS =               \
        silcvcard       \
 #endif SILC_DIST_VCARD
 
+if SILC_ENABLE_SHARED
+LIBTOOL_OPTS= -rpath $(DESTDIR)$(libdir)
+else
+LIBTOOL_OPTS=
+endif
+
 SILCLIB = libsilc.a
 
 #ifdef SILC_DIST_CLIENTLIB
@@ -118,7 +124,7 @@ libsilc.a:
        find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilc.la
 
 #ifdef SILC_DIST_CLIENTLIB
 LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
@@ -129,7 +135,7 @@ libsilcclient.a:
        find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB
 
 #ifdef SILC_DIST_SERVERLIB
@@ -141,7 +147,7 @@ libsilcserver.a:
        find $(SILCSERVERLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcserver.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilcserver.la
 #endif SILC_DIST_SERVERLIB
 
 #ifdef SILC_DIST_TOOLKIT