diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2007-02-05 21:59:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2007-02-05 21:59:28 +0000 |
| commit | 7e7504f33d1ac54c085ef5ff3bc7788b9ef05f42 (patch) | |
| tree | a4328158c212f404bb3a963f6f458affedb98e1d /media-libs/imlib/files | |
| parent | Version bump (1.0_rc2) (diff) | |
| download | historical-7e7504f33d1ac54c085ef5ff3bc7788b9ef05f42.tar.gz historical-7e7504f33d1ac54c085ef5ff3bc7788b9ef05f42.tar.bz2 historical-7e7504f33d1ac54c085ef5ff3bc7788b9ef05f42.zip | |
Revert a change in patch and really fix autotools.
Package-Manager: portage-2.1.2-r7
Diffstat (limited to 'media-libs/imlib/files')
| -rw-r--r-- | media-libs/imlib/files/imlib-1.9.15.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/media-libs/imlib/files/imlib-1.9.15.patch b/media-libs/imlib/files/imlib-1.9.15.patch index 6b8bc06864a7..c78aea9ad98f 100644 --- a/media-libs/imlib/files/imlib-1.9.15.patch +++ b/media-libs/imlib/files/imlib-1.9.15.patch @@ -1,14 +1,10 @@ diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in --- imlib-1.9.15.orig/configure.in 2004-09-23 04:13:45.000000000 +0300 -+++ imlib-1.9.15/configure.in 2007-02-05 20:10:48.000000000 +0200 -@@ -17,10 +17,20 @@ ++++ imlib-1.9.15/configure.in 2007-02-05 23:43:18.000000000 +0200 +@@ -17,11 +17,26 @@ dnl incase it is broken for example. AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes") --AM_PATH_GTK(1.2.1,[ -- GDK_IMLIB="gdk_imlib utils"],[ -- GDK_IMLIB="" -- AC_MSG_WARN([*** gdk_imlib will not be built ***])]) +AC_ARG_ENABLE(gdk, [ --enable-gdk enable gdk_imlib compilation [default=yes]],[ + if test x$enableval = xyes; then + disable_gdk="no" @@ -17,18 +13,24 @@ diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in + fi],disable_gdk=no) + +if test x$disable_gdk = xno; then -+ AC_MSG_RESULT(no) -+ GDK_IMLIB="gdk_imlib utils" ++ AC_MSG_RESULT(no) ++ + AM_PATH_GTK(1.2.1,[ + GDK_IMLIB="gdk_imlib utils"],[ + GDK_IMLIB="" + AC_MSG_WARN([*** gdk_imlib will not be built ***])]) + +else + AC_MSG_RESULT(yes) + GDK_IMLIB="" +fi - ++ AC_MSG_CHECKING(whether to build gmodulized imlib) + AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[ diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in --- imlib-1.9.15.orig/imlib-config.in 2004-08-27 19:03:11.000000000 +0300 -+++ imlib-1.9.15/imlib-config.in 2007-02-05 20:59:43.000000000 +0200 ++++ imlib-1.9.15/imlib-config.in 2007-02-05 23:46:34.000000000 +0200 @@ -46,15 +46,9 @@ echo @VERSION@ ;; @@ -47,7 +49,7 @@ diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in --libs) diff -ur imlib-1.9.15.orig/imlib.m4 imlib-1.9.15/imlib.m4 --- imlib-1.9.15.orig/imlib.m4 2004-08-27 19:03:11.000000000 +0300 -+++ imlib-1.9.15/imlib.m4 2007-02-05 21:36:58.000000000 +0200 ++++ imlib-1.9.15/imlib.m4 2007-02-05 23:42:57.000000000 +0200 @@ -6,7 +6,7 @@ dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS |