kov changed libgksu/trunk/ChangeLog, libgksu/trunk/configure.ac, libgksu/trunk/libgksu/Makefile.am

Gustavo Noronha kov at costa.debian.org
Mon May 1 14:47:51 UTC 2006


Mensagem de log: 
patch to only use the version script if supported


-----


Modified: libgksu/trunk/ChangeLog
===================================================================
--- libgksu/trunk/ChangeLog	2006-05-01 14:40:58 UTC (rev 607)
+++ libgksu/trunk/ChangeLog	2006-05-01 14:47:50 UTC (rev 608)
@@ -1,5 +1,10 @@
 2006-05-01  Gustavo Noronha Silva  <kov at debian.org>
 
+	* configure.ac, libgksu/Makefile.am:
+	- only use the version script if the system we're
+	  building on supports it; thanks to Daniel Macks
+	  for the patch
+
 	* libgksu/libgksu.c:
 	- check fread's return value before using strlen
 	  and setting a \0 in the xauth string, to prevent

Modified: libgksu/trunk/configure.ac
===================================================================
--- libgksu/trunk/configure.ac	2006-05-01 14:40:58 UTC (rev 607)
+++ libgksu/trunk/configure.ac	2006-05-01 14:47:50 UTC (rev 608)
@@ -29,6 +29,14 @@
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
+##################################################
+# Check for linker --version-script flag
+##################################################
+lt_simple_link_test_code='int main(){return(0);}\n'
+AC_LIBTOOL_LINKER_OPTION([whether the linker accepts the --version-script flag],
+		   use_version_script, [-Wl,--version-script=libgksu/libgksu.ver])
+AM_CONDITIONAL(USE_VERSION_SCRIPT, test x$use_version_script = xyes)
+
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 

Modified: libgksu/trunk/libgksu/Makefile.am
===================================================================
--- libgksu/trunk/libgksu/Makefile.am	2006-05-01 14:40:58 UTC (rev 607)
+++ libgksu/trunk/libgksu/Makefile.am	2006-05-01 14:47:50 UTC (rev 608)
@@ -9,7 +9,10 @@
 # minor -> keeps compatibility (additions to the API)
 # micro -> no change to the API/ABI
 libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
-libgksu2_la_LDFLAGS = -version-info 0:1:0 -Wl,--version-script=libgksu.ver -Wl,-O1 -lutil ${LIBGKSU_LIBS}
+libgksu2_la_LDFLAGS = -version-info 0:1:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
+if USE_VERSION_SCRIPT
+libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
+endif
 
 noinst_HEADERS = defines.h
 




More information about the gksu-commits mailing list