summaryrefslogtreecommitdiff
path: root/graphics/imlib/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/imlib/files/patch-aa')
-rw-r--r--graphics/imlib/files/patch-aa45
1 files changed, 36 insertions, 9 deletions
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 1d43b872d636..ed8f6a0c02e2 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,7 +1,16 @@
---- configure.orig Thu Feb 25 01:44:38 1999
-+++ configure Mon Mar 1 20:30:08 1999
-@@ -2304,8 +2304,8 @@
- echo "configure:2305: checking If dynamic linking works on this system" >&5
+--- configure.orig Wed Sep 1 04:00:37 1999
++++ configure Mon Sep 6 15:17:37 1999
+@@ -1826,7 +1826,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -2367,8 +2367,8 @@
+ echo "configure:2368: checking whether to build gmodulized imlib" >&5
oLIBS="$LIBS"
oCFLAGS="$CFLAGS"
- LIBS="$LIBS `glib-config --libs gmodule`"
@@ -11,7 +20,7 @@
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
-@@ -2354,8 +2354,8 @@
+@@ -2418,8 +2418,8 @@
#define USE_GMODULE 1
EOF
@@ -22,21 +31,39 @@
echo "$ac_t""yes" 1>&6
-@@ -4153,7 +4153,7 @@
+@@ -4217,7 +4217,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $X_LIBS $LIBS"
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 4159 "configure"
+ #line 4223 "configure"
#include "confdefs.h"
-@@ -4488,7 +4488,7 @@
+@@ -4536,7 +4536,7 @@
+ echo "$ac_t""$jpeg_ok" 1>&6
+ if test "$jpeg_ok" = yes; then
+ JPEGLIBS="-ljpeg"
+- SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
++ SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBJPEG 1
+ EOF
+
+@@ -4552,7 +4552,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 4494 "configure"
+ #line 4558 "configure"
#include "confdefs.h"
+@@ -4609,7 +4609,7 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ TIFFLIBS="-ltiff"
+- SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
++ SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBTIFF 1
+ EOF
+