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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/05 13:20:30

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

Log message:
        patch #4872

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.config.in.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.251&tr2=1.252&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.715&tr2=1.716&r1=text&r2=text

Patches:
Index: mldonkey/config/Makefile.config.in
diff -u mldonkey/config/Makefile.config.in:1.56 
mldonkey/config/Makefile.config.in:1.57
--- mldonkey/config/Makefile.config.in:1.56     Thu Jan 26 00:25:24 2006
+++ mldonkey/config/Makefile.config.in  Sun Feb  5 13:20:30 2006
@@ -49,9 +49,14 @@
 address@hidden@
 address@hidden@
 address@hidden@
+
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
 address@hidden@
 address@hidden@
 
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.144 mldonkey/config/Makefile.in:1.145
--- mldonkey/config/Makefile.in:1.144   Thu Jan 26 10:39:59 2006
+++ mldonkey/config/Makefile.in Sun Feb  5 13:20:30 2006
@@ -100,7 +100,7 @@
 
 INCLUDES += $(foreach file, $(SUBDIRS), -I $(file))
 
-CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS)
+CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS)
 
 # use_tags$(EXE) 
 TARGETS= mlnet$(EXE) 
@@ -145,7 +145,6 @@
   CDK_SRCS +=  $(CDK)/bzlib.ml $(CDK)/bzip2.ml
 endif
 
-LIBS_flags += -cclib -lz
 CDK_SRCS +=  $(CDK)/zlib.ml $(CDK)/zip.ml $(CDK)/gzip.ml $(CDK)/zlibstubs.c 
$(CDK)/tar.ml
 
 CDK_SRCS += $(LIB)/autoconf.ml
@@ -537,15 +536,7 @@
 endif
 
 ifeq ("$(GD)", "yes")
-  GD_LIBS_flags += -cclib -lgd -cclib -lfreetype -cclib -lm
-  GD_LIBS_flags += -ccopt -W -ccopt -Wall -ccopt -Wno-unused
-  ifeq ("$(GD_JPG)", "yes")
-    GD_LIBS_flags += -cclib -ljpeg
-  endif
-  ifeq ("$(GD_PNG)", "yes")
-    GD_LIBS_flags += -cclib -lpng
-    GD_LIBS_flags += -ccopt -DHAVE_JPEG
-  endif
+  GD_LIBS_flags=-cclib "-lgd $(GD_LIBS)" -ccopt "$(GD_LDFLAGS)"
   DRIVER_SRCS= \
     $(CDK)/gd.ml \
     $(CDK)/gdstubs.c \
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.251 mldonkey/config/configure.in:1.252
--- mldonkey/config/configure.in:1.251  Sun Feb  5 13:15:55 2006
+++ mldonkey/config/configure.in        Sun Feb  5 13:20:30 2006
@@ -46,8 +46,6 @@
     ;;
   *netbsd*)
     SYSTEM=netbsd
-    CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
-    LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"
     ;;
   *linux*)
     SYSTEM=linux
@@ -984,12 +982,17 @@
   GD=no
   LIBGD=no
   SAVE_LIBS=$LIBS
-
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LDFLAGS=$LDFLAGS
   AC_CHECK_PROG(GDLIBCONFIG, gdlib-config, gdlib-config)
   if test "$ac_cv_prog_GDLIBCONFIG" = "gdlib-config"; then
-    GDLIBLIBS=`$GDLIBCONFIG --libs`
-    GDLIBS="$LIBS -lgd $GDLIBLIBS"
-    LIBS=$GDLIBS
+    GD_LIBS=`$GDLIBCONFIG --libs`
+    GD_LIBS2="$LIBS -lgd $GD_LIBS"
+    LIBS=$GD_LIBS2
+    GD_CFLAGS=`$GDLIBCONFIG --cflags`
+    CFLAGS="$CFLAGS $GD_CFLAGS"
+    GD_LDFLAGS=`$GDLIBCONFIG --ldflags`
+    LDFLAGS="$LDFLAGS $GD_LDFLAGS"
     AC_MSG_CHECKING(for libgd > 2.0.14)
     GDVERSION=`$GDLIBCONFIG --version`
     GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
@@ -1029,7 +1032,7 @@
       AC_MSG_NOTICE(png support not available)
     else
       LIBGD_PNG=no
-      LIBS=$GDLIBS
+      LIBS=$GD_LIBS2
       AC_MSG_CHECKING(for gdImagePng in -lgd)
       AC_TRY_LINK([#include <gd.h>],
       [gdImagePng (0,0);],
@@ -1061,7 +1064,7 @@
       AC_MSG_NOTICE(jpeg support not available)
     else
       LIBGD_JPG=no
-      LIBS=$GDLIBS
+      LIBS=$GD_LIBS2
       AC_MSG_CHECKING(for gdImageJpeg in -lgd)
       AC_TRY_LINK([#include <gd.h>],
       [gdImageJpeg (0,0,0);],
@@ -1088,6 +1091,8 @@
     AC_MSG_NOTICE(libgd not available)
   fi
   LIBS=$SAVE_LIBS
+  CFLAGS=$SAVE_CFLAGS
+  LDFLAGS=$SAVE_LDFLAGS
 fi
 if test "$GD" != "no"; then
   GDGRAPHICS=DriverGraphics_gd
@@ -1195,6 +1200,9 @@
 AC_SUBST(GD_JPG)
 AC_SUBST(GD_PNG)
 AC_SUBST(GDGRAPHICS)
+AC_SUBST(GD_LIBS)
+AC_SUBST(GD_CFLAGS)
+AC_SUBST(GD_LDFLAGS)
 AC_SUBST(BZIP2)
 
 BUILD_SYSTEM="`uname -s` `uname -m` `uname -r`"
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.715 mldonkey/distrib/ChangeLog:1.716
--- mldonkey/distrib/ChangeLog:1.715    Sun Feb  5 13:19:14 2006
+++ mldonkey/distrib/ChangeLog  Sun Feb  5 13:20:30 2006
@@ -15,6 +15,8 @@
 =========
 
 2006/02/05
+4872: Fix gd detection on NetBSD, use data from gdlib-config
+      MinGW compile-guide was updated, gdlib-config has to be changed
 4871: Optimize some Printf.sprintf "%s" code
 4869: Remove obsolete redirector code
       http://mldonkey.sourceforge.net/Redirector