1 diff -pruN imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in
2 --- imlib-1.9.15.orig/configure.in 2008-10-23 21:34:03.904349217 +1100
3 +++ imlib-1.9.15/configure.in 2008-10-23 21:35:56.881224111 +1100
4 @@ -5,6 +5,7 @@ AC_INIT(gdk_imlib/gdk_imlib.h)
5 cflags_set=${CFLAGS+set}
6
7 AC_CONFIG_HEADERS(config.h)
8 +AC_CONFIG_MACRO_DIR([m4])
9
10 AM_INIT_AUTOMAKE(imlib, 1.9.15)
11 AC_PROG_CC
12 @@ -17,11 +18,26 @@ dnl Give the user an option to compile w
13 dnl incase it is broken for example.
14 AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
15
16 +AC_ARG_ENABLE(gdk, [ --enable-gdk enable gdk_imlib compilation [default=yes]],[
17 + if test x$enableval = xyes; then
18 + disable_gdk="no"
19 + else
20 + disable_gdk="yes"
21 + fi],disable_gdk=no)
22 +
23 +if test x$disable_gdk = xno; then
24 + AC_MSG_RESULT(no)
25 +
26 AM_PATH_GTK(1.2.1,[
27 GDK_IMLIB="gdk_imlib utils"],[
28 GDK_IMLIB=""
29 AC_MSG_WARN([*** gdk_imlib will not be built ***])])
30
31 +else
32 + AC_MSG_RESULT(yes)
33 + GDK_IMLIB=""
34 +fi
35 +
36 AC_MSG_CHECKING(whether to build gmodulized imlib)
37
38 AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[
39 diff -pruN imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in
40 --- imlib-1.9.15.orig/imlib-config.in 2008-10-23 21:34:03.904349217 +1100
41 +++ imlib-1.9.15/imlib-config.in 2008-10-23 21:34:28.226349920 +1100
42 @@ -46,15 +46,9 @@ while test $# -gt 0; do
43 echo @VERSION@
44 ;;
45 --cflags)
46 - if test @includedir@ != /usr/include ; then
47 - includes=-I@includedir@
48 - fi
49 echo $includes @X_CFLAGS@
50 ;;
51 --cflags-gdk)
52 - if test @includedir@ != /usr/include ; then
53 - includes=-I@includedir@
54 - fi
55 echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
56 ;;
57 --libs)
58 diff -pruN imlib-1.9.15.orig/imlib.m4 imlib-1.9.15/imlib.m4
59 --- imlib-1.9.15.orig/imlib.m4 2008-10-23 21:34:03.901349273 +1100
60 +++ imlib-1.9.15/imlib.m4 2008-10-23 21:34:28.227349890 +1100
61 @@ -6,7 +6,7 @@
62 dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
63 dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
64 dnl
65 -AC_DEFUN(AM_PATH_IMLIB,
66 +AC_DEFUN([AM_PATH_IMLIB],
67 [dnl
68 dnl Get the cflags and libraries from the imlib-config script
69 dnl
70 @@ -164,7 +164,7 @@ int main ()
71 ])
72
73 # Check for gdk-imlib
74 -AC_DEFUN(AM_PATH_GDK_IMLIB,
75 +AC_DEFUN([AM_PATH_GDK_IMLIB],
76 [dnl
77 dnl Get the cflags and libraries from the imlib-config script
78 dnl
79 diff -pruN imlib-1.9.15.orig/Makefile.am imlib-1.9.15/Makefile.am
80 --- imlib-1.9.15.orig/Makefile.am 2008-10-23 21:34:03.901349273 +1100
81 +++ imlib-1.9.15/Makefile.am 2008-10-23 21:38:28.168099386 +1100
82 @@ -1,3 +1,5 @@
83 +ACLOCAL_AMFLAGS= -I m4
84 +
85 SUBDIRS = @GDK_IMLIB@ Imlib config doc
86 bin_SCRIPTS = imlib-config
87
|
