[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/23 12:18:27

Modified files:
        config         : Makefile.config.in Makefile.in configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5478

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.config.in?cvsroot=mldonkey&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.284&r2=1.285
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1058&r2=1.1059

Patches:
Index: config/Makefile.config.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.config.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- config/Makefile.config.in   26 Aug 2006 12:04:25 -0000      1.62
+++ config/Makefile.config.in   23 Oct 2006 12:18:27 -0000      1.63
@@ -58,6 +58,7 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 

Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- config/Makefile.in  23 Sep 2006 22:25:06 -0000      1.170
+++ config/Makefile.in  23 Oct 2006 12:18:27 -0000      1.171
@@ -530,6 +530,9 @@
 
 ifeq ("$(GD)", "yes")
   GD_LIBS_flags=-cclib "-lgd $(GD_LIBS)" -ccopt "$(GD_LDFLAGS)"
+  ifneq ("$(GD_STATIC_LIBS)", "")
+    GD_STATIC_LIBS_opt=-cclib "-lgd $(GD_STATIC_LIBS)" -ccopt "$(GD_LDFLAGS)"
+  endif
   DRIVER_SRCS= \
     $(CDK)/gd.ml \
     $(CDK)/gdstubs.c \

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -b -r1.284 -r1.285
--- config/configure.in 3 Oct 2006 15:23:08 -0000       1.284
+++ config/configure.in 23 Oct 2006 12:18:27 -0000      1.285
@@ -789,6 +789,10 @@
   AC_CHECK_PROG(GDLIBCONFIG, gdlib-config, gdlib-config)
   if test "$ac_cv_prog_GDLIBCONFIG" = "gdlib-config"; then
     GD_LIBS=`$GDLIBCONFIG --libs`
+    $GDLIBCONFIG --static-libs > /dev/null 2>&1
+    if test "$?" = "0"; then
+      GD_STATIC_LIBS=`$GDLIBCONFIG --static-libs`
+    fi
     GD_LIBS2="$LIBS -lgd $GD_LIBS"
     LIBS=$GD_LIBS2
     GD_CFLAGS=`$GDLIBCONFIG --cflags`
@@ -1405,6 +1409,7 @@
 AC_SUBST(GD_PNG)
 AC_SUBST(GDGRAPHICS)
 AC_SUBST(GD_LIBS)
+AC_SUBST(GD_STATIC_LIBS)
 AC_SUBST(GD_CFLAGS)
 AC_SUBST(GD_LDFLAGS)
 AC_SUBST(BZIP2)

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -b -r1.1058 -r1.1059
--- distrib/ChangeLog   23 Oct 2006 12:17:34 -0000      1.1058
+++ distrib/ChangeLog   23 Oct 2006 12:18:27 -0000      1.1059
@@ -15,6 +15,7 @@
 =========
 
 2006/10/23
+5478: Support gdlib-config --static-libs function (new on Debian Etch)
 5476: Urladd: Change default period to 0 (load file only when core starts)
 
 2006/10/21