- fixes: pass to CFLAGS -DHAVE_JPEG if libjpeg found and with -DHAVE_LIBTTF

  if libtiff found.

Changed files:
    gd-ac_am.patch -> 1.3

diff --git a/gd-ac_am.patch b/gd-ac_am.patch
index ded620a2201771a536b69efb221b2dc364ec6ea3..b8c4a2f6e5d3b2c408873883412c47f117339db6 100644 (file)
--- a/gd-ac_am.patch
+++ b/gd-ac_am.patch
@@ -1,6 +1,6 @@
 diff -Nru gd-1.8.3/Makefile.am gd-1.8.3.new/Makefile.am
 --- gd-1.8.3/Makefile.am       Thu Jan  1 01:00:00 1970
-+++ gd-1.8.3.new/Makefile.am   Wed Aug 30 23:22:41 2000
++++ gd-1.8.3.new/Makefile.am   Mon Dec  4 06:37:15 2000
 @@ -0,0 +1,90 @@
 +## Process this file with automake to produce Makefile.in
 +
@@ -94,8 +94,8 @@ diff -Nru gd-1.8.3/Makefile.am gd-1.8.3.new/Makefile.am
 +CLEANFILES = demoout.png
 diff -Nru gd-1.8.3/configure.in gd-1.8.3.new/configure.in
 --- gd-1.8.3/configure.in      Thu Jan  1 01:00:00 1970
-+++ gd-1.8.3.new/configure.in  Wed Aug 30 23:21:17 2000
-@@ -0,0 +1,43 @@
++++ gd-1.8.3.new/configure.in  Mon Dec  4 06:44:13 2000
+@@ -0,0 +1,47 @@
 +dnl Process this file with autoconf to produce a configure script
 +
 +AC_INIT(configure.in)
@@ -116,13 +116,17 @@ diff -Nru gd-1.8.3/configure.in gd-1.8.3.new/configure.in
 +
 +dnl Checks for libraries.
 +dnl Replace `main' with a function in -ljpeg:
-+AC_CHECK_LIB(jpeg, main)
-+dnl Replace `main' with a function in -lm:
-+AC_CHECK_LIB(m, main)
++AC_CHECK_LIB(jpeg, main, [CFLAGS="$CFLAGS -DHAVE_JPEG"; LIBS="$LIBS -ljpeg"])
++dnl Replace `main' with a function in -ltiff:
++AC_CHECK_LIB(tiff, main, [CFLAGS="$CFLAGS -DHAVE_LIBTTF"; LIBS="$LIBS -ltiff"])
++dnl Replace `main' with a function in -ltiff:
++AC_CHECK_LIB(fff, main)
 +dnl Replace `main' with a function in -lpng:
 +AC_CHECK_LIB(png, main, ,AC_MSG_ERROR(libpng not found.))
 +dnl Replace `main' with a function in -lttf:
 +AC_CHECK_LIB(ttf, main)
++dnl Replace `main' with a function in -lm:
++AC_CHECK_LIB(m, main)
 +dnl Replace `main' with a function in -lz:
 +AC_CHECK_LIB(z, main, ,AC_MSG_ERROR(libz not found.))
 +