[Mldonkey-commits] Changes to mldonkey/config/configure.in

[mldonkey-commits]

Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.215 mldonkey/config/configure.in:1.216
--- mldonkey/config/configure.in:1.215  Sun Aug 28 10:49:49 2005
+++ mldonkey/config/configure.in        Sun Aug 28 11:00:20 2005
@@ -17,7 +17,6 @@
 
 OS_FILES=unix
 OS_FILES2=unix
-
 case $host in
   *mingw*)
     OS_FILES=mingw
@@ -28,6 +27,10 @@
   *cygwin*)
     OS_FILES2=cygwin
     ;;
+  *freebsd*)
+    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+    LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+    ;;
 esac
 
 case "`uname -s`" in
@@ -1098,15 +1101,45 @@
 if test "$GD" != "no"; then
   GD=no
   LIBGD=no
-  AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes])
+  SAVE_LIBS=$LIBS
+
+  AC_CHECK_PROG(GDLIBCONFIG, gdlib-config, gdlib-config)
+  if test "$ac_cv_prog_GDLIBCONFIG" = "gdlib-config"; then
+    GDLIBS=`$GDLIBCONFIG --libs`
+    LIBS="$LIBS -lgd $GDLIBS"
+  fi
+
+  AC_MSG_CHECKING(for gdImageCreate in -lgd)
+  AC_TRY_LINK([#include <gd.h>],
+  [gdImageCreate (0,0);],
+  [LIBGD=yes], [LIBGD=no])
+  AC_MSG_RESULT($LIBGD)
+
+  if test "$LIBGD" = "no"; then
+    AC_MSG_CHECKING(trying another method)
+    AC_CHECK_LIB(gd, gdImageCreate, [LIBGD=yes], [LIBGD=no])
+  fi
+
   if test "$LIBGD" = "yes"; then
+
     LIBPNG=no
     AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes])
-    LIBGD_PNG=no
-    AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes])
+
     if test "$LIBPNG" = "no"; then
       AC_MSG_NOTICE(png support not available)
     else
+      LIBGD_PNG=no
+      AC_MSG_CHECKING(for gdImagePng in -lgd)
+      AC_TRY_LINK([#include <gd.h>],
+      [gdImagePng (0,0);],
+      [LIBGD_PNG=yes], [LIBGD_PNG=no])
+      AC_MSG_RESULT($LIBGD_PNG)
+
+      if test "$LIBGD_PNG" = "no"; then
+        AC_MSG_CHECKING(trying another method)
+        AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes], [LIBGD_PNG=no])
+      fi
+
       if test "$LIBGD_PNG" = "yes"; then
         GD=yes
         HAS_GD_PNG=true
@@ -1119,13 +1152,25 @@
         AC_MSG_NOTICE(png support not available in libgd)
       fi
     fi
+
     LIBJPEG=no
     AC_CHECK_LIB(jpeg, jpeg_CreateCompress, [LIBJPEG=yes])
-    LIBGD_JPG=no
-    AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes])
+
     if test "$LIBJPEG" = "no"; then
       AC_MSG_NOTICE(jpeg support not available)
     else
+      LIBGD_JPG=no
+      AC_MSG_CHECKING(for gdImageJpeg in -lgd)
+      AC_TRY_LINK([#include <gd.h>],
+      [gdImageJpeg (0,0,0);],
+      [LIBGD_JPG=yes], [LIBGD_JPG=no])
+      AC_MSG_RESULT($LIBGD_JPG)
+
+      if test "$LIBGD_JPG" = "no"; then
+        AC_MSG_CHECKING(trying another method)
+        AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes], [LIBGD_JPG=no])
+      fi
+
       if test "$LIBGD_JPG" = "yes"; then
         GD=yes
        HAS_GD_JPG=true
@@ -1140,6 +1185,7 @@
   else
     AC_MSG_NOTICE(libgd not available)
   fi
+  LIBS=$SAVE_LIBS
 fi
 AC_MSG_CHECKING(support for graphical statistics)
 if test "$GD" != "no"; then