/[mldonkey]/mldonkey/config/configure.in
ViewVC logotype

Diff of /mldonkey/config/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.190 by spiralvoice, Thu Jun 23 15:43:03 2005 UTC revision 1.191 by spiralvoice, Fri Jun 24 23:49:14 2005 UTC
# Line 474  AC_CHECK_HEADERS(sys/poll.h,,) Line 474  AC_CHECK_HEADERS(sys/poll.h,,)
474  AC_CHECK_FUNCS(poll,,)  AC_CHECK_FUNCS(poll,,)
475    
476  ZLIB=no  ZLIB=no
477  AC_CHECK_LIB(z,inflate,[ZLIB=yes])  AC_CHECK_LIB(z,inflate,[AC_CHECK_HEADERS(zlib.h,[ZLIB=yes],)])
 AC_CHECK_HEADERS(zlib.h,,[ZLIB=no])  
   
478  if test "$ZLIB" = "yes"; then  if test "$ZLIB" = "yes"; then
479    HAS_ZLIB=true    HAS_ZLIB=true
480    ZLIB__UNCOMPRESS_STRING2="Zlib.uncompress_string2 s"    ZLIB__UNCOMPRESS_STRING2="Zlib.uncompress_string2 s"
# Line 1023  else Line 1021  else
1021  fi  fi
1022    
1023  # testing for gd support  # testing for gd support
 LIBPNG=no  
 AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes])  
   
 LIBJPEG=no  
 AC_CHECK_LIB(jpeg, jpeg_CreateCompress, [LIBJPEG=yes])  
   
 LIBGD_GIF=no  
 AC_CHECK_LIB(gd, gdImageGif,[LIBGD_GIF=yes])  
   
 LIBGD_PNG=no  
 AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes])  
1024    
1025  LIBGD_JPG=no  HAS_GD=false
1026  AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes])  HAS_GD_JPG=false
1027    HAS_GD_PNG=false
1028  AC_MSG_CHECKING(compile with gd)  GD_JPG=no
1029    GD_PNG=no
1030  if test "$GD" != "no"; then  if test "$GD" != "no"; then
1031    GD=no    GD=no
1032    if test "$ZLIB" = "no"; then    LIBGD=no
1033      echo "you need to install zlib"    AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes])
1034    else    if test "$LIBGD" = "yes"; then
1035        LIBPNG=no
1036        AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes])
1037        LIBGD_PNG=no
1038        AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes])
1039      if test "$LIBPNG" = "no"; then      if test "$LIBPNG" = "no"; then
1040        echo "you need to install libpng"        AC_MSG_NOTICE(png support not available)
1041      else      else
1042        if test "$LIBJPEG" = "no"; then        if test "$LIBGD_PNG" = "yes"; then
1043          echo "you need to install libjpeg"          GD=yes
1044            HAS_GD_PNG=true
1045            GD_PNG=yes
1046            AC_DEFINE(HAVE_GD_PNG, 1, [Define to 1 if you have png support in libgd.])
1047            AC_MSG_NOTICE(using png support in libgd)
1048        else        else
1049          if test "$LIBGD_PNG" = "yes"; then          HAS_GD_PNG=false
1050            echo "you need to install gd (libgd-dev)"          AC_MSG_NOTICE(png support not available in libgd)
         else  
           if test "$LIBGD_JPG" = "yes"; then  
             GD=yes  
           fi  
         fi  
1051        fi        fi
1052      fi      fi
1053        LIBJPEG=no
1054        AC_CHECK_LIB(jpeg, jpeg_CreateCompress, [LIBJPEG=yes])
1055        LIBGD_JPG=no
1056        AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes])
1057        if test "$LIBJPEG" = "no"; then
1058          AC_MSG_NOTICE(jpeg support not available)
1059        else
1060          if test "$LIBGD_JPG" = "yes"; then
1061            GD=yes
1062            HAS_GD_JPG=true
1063            GD_JPG=yes
1064            AC_DEFINE(HAVE_GD_JPG, 1, [Define to 1 if you have jpg support in libgd.])
1065            AC_MSG_NOTICE(using jpeg support in libgd)
1066          else
1067            HAS_GD_JPG=false
1068            AC_MSG_NOTICE(jpeg support not available in libgd)
1069          fi
1070        fi
1071      else
1072        AC_MSG_NOTICE(libgd not available)
1073    fi    fi
1074  fi  fi
1075    AC_MSG_CHECKING(support for graphical statistics)
1076  if test "$GD" != "no"; then  if test "$GD" != "no"; then
1077    HAS_GD=true    HAS_GD=true
1078    cp -f ../src/daemon/common/commonGraphics.gd.ml ../src/daemon/common/commonGraphics.ml    cp -f ../src/daemon/common/commonGraphics.gd.ml ../src/daemon/common/commonGraphics.ml
# Line 1073  fi Line 1085  fi
1085    
1086  MD4ARCH=$arch  MD4ARCH=$arch
1087  case $host in  case $host in
1088    i386-pc-linux*) MD4COMP=as; MD4ARCH=i386;;    i386-pc-linux*|i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;
1089    i486-pc-linux*) MD4COMP=as; MD4ARCH=i486;;    i486-pc-linux*|i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;
1090    i586-pc-linux*) MD4COMP=as; MD4ARCH=i586;;    i586-pc-linux*|i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;
1091    i686-pc-linux*) MD4COMP=as; MD4ARCH=i686;;    i686-pc-linux*|i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;
1092    i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;    i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;
1093    i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;    i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;
1094    i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;    i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;
1095    i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;    i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;
   i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;  
   i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;  
   i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;  
   i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;  
1096    *) MD4COMP=cc;;    *) MD4COMP=cc;;
1097  esac  esac
1098    
# Line 1150  AC_SUBST(MD4ARCH) Line 1158  AC_SUBST(MD4ARCH)
1158  AC_SUBST(MD4COMP)  AC_SUBST(MD4COMP)
1159  AC_SUBST(ZLIB)  AC_SUBST(ZLIB)
1160  AC_SUBST(GD)  AC_SUBST(GD)
1161    AC_SUBST(GD_JPG)
1162    AC_SUBST(GD_PNG)
1163  AC_SUBST(ICONV)  AC_SUBST(ICONV)
1164    
1165  AC_SUBST(OPEN_NAPSTER)  AC_SUBST(OPEN_NAPSTER)
# Line 1201  AC_SUBST(GTKCFLAGS) Line 1211  AC_SUBST(GTKCFLAGS)
1211  AC_SUBST(GTKLLIBS)  AC_SUBST(GTKLLIBS)
1212  AC_SUBST(GTKLFLAGS)  AC_SUBST(GTKLFLAGS)
1213  AC_SUBST(HAS_GD)  AC_SUBST(HAS_GD)
1214    AC_SUBST(HAS_GD_PNG)
1215    AC_SUBST(HAS_GD_JPG)
1216  AC_SUBST(HAS_ZLIB)  AC_SUBST(HAS_ZLIB)
1217  AC_SUBST(ZLIB__UNCOMPRESS_STRING2)  AC_SUBST(ZLIB__UNCOMPRESS_STRING2)
1218  AC_SUBST(ZLIB__COMPRESS_STRING)  AC_SUBST(ZLIB__COMPRESS_STRING)

Legend:
Removed from v.1.190  
changed lines
  Added in v.1.191

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26