You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.2 KiB
70 lines
2.2 KiB
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 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") |
|
|
|
+AC_ARG_ENABLE(gdk, [ --enable-gdk enable gdk_imlib compilation [default=yes]],[ |
|
+ if test x$enableval = xyes; then |
|
+ disable_gdk="no" |
|
+ else |
|
+ disable_gdk="yes" |
|
+ fi],disable_gdk=no) |
|
+ |
|
+if test x$disable_gdk = xno; then |
|
+ 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 23:46:34.000000000 +0200 |
|
@@ -46,15 +46,9 @@ |
|
echo @VERSION@ |
|
;; |
|
--cflags) |
|
- if test @includedir@ != /usr/include ; then |
|
- includes=-I@includedir@ |
|
- fi |
|
echo $includes @X_CFLAGS@ |
|
;; |
|
--cflags-gdk) |
|
- if test @includedir@ != /usr/include ; then |
|
- includes=-I@includedir@ |
|
- fi |
|
echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@ |
|
;; |
|
--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 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 |
|
dnl |
|
-AC_DEFUN(AM_PATH_IMLIB, |
|
+AC_DEFUN([AM_PATH_IMLIB], |
|
[dnl |
|
dnl Get the cflags and libraries from the imlib-config script |
|
dnl |
|
@@ -164,7 +164,7 @@ |
|
]) |
|
|
|
# Check for gdk-imlib |
|
-AC_DEFUN(AM_PATH_GDK_IMLIB, |
|
+AC_DEFUN([AM_PATH_GDK_IMLIB], |
|
[dnl |
|
dnl Get the cflags and libraries from the imlib-config script |
|
dnl
|
|
|