From deffbf0bda6ae966294433168e999723d35a23ff Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Tue, 10 Apr 2007 11:26:09 +0000 Subject: [PATCH] Tue Apr 10 12:40:19 CEST 2007 Jochen Eisinger * Only pass -rpath to libtool when building shared libraries. Affected file lib/Makefile.ad * Removing the stray "s" in configure.ad --- CHANGES | 6 ++++++ configure.ad | 2 +- lib/Makefile.ad | 12 +++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index b013f6b2..337bc818 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +Tue Apr 10 12:40:19 CEST 2007 Jochen Eisinger + + * 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 * Redraw the screen after creating a new key. Affected file diff --git a/configure.ad b/configure.ad index 3282af2a..a303d5c4 100644 --- a/configure.ad +++ b/configure.ad @@ -4,7 +4,7 @@ # Author: Pekka Riikonen # # 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 47844fa6..94234745 100644 --- 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 -- 2.24.0