Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/imlib/patches/imlib-1.9.15-conditional-gtk1.patch

    Contents of /trunk/imlib/patches/imlib-1.9.15-conditional-gtk1.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 970 - (show annotations) (download)
    Sat Jan 2 12:37:26 2010 UTC (14 years, 4 months ago) by niro
    File size: 2253 byte(s) 
    make gtk1 conditional
    1 diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in
    2 --- imlib-1.9.15.orig/configure.in 2004-09-23 04:13:45.000000000 +0300
    3 +++ imlib-1.9.15/configure.in 2007-02-05 23:43:18.000000000 +0200
    4 @@ -17,11 +17,26 @@
    5 dnl incase it is broken for example.
    6 AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
    7
    8 +AC_ARG_ENABLE(gdk, [ --enable-gdk enable gdk_imlib compilation [default=yes]],[
    9 + if test x$enableval = xyes; then
    10 + disable_gdk="no"
    11 + else
    12 + disable_gdk="yes"
    13 + fi],disable_gdk=no)
    14 +
    15 +if test x$disable_gdk = xno; then
    16 + AC_MSG_RESULT(no)
    17 +
    18 AM_PATH_GTK(1.2.1,[
    19 GDK_IMLIB="gdk_imlib utils"],[
    20 GDK_IMLIB=""
    21 AC_MSG_WARN([*** gdk_imlib will not be built ***])])
    22
    23 +else
    24 + AC_MSG_RESULT(yes)
    25 + GDK_IMLIB=""
    26 +fi
    27 +
    28 AC_MSG_CHECKING(whether to build gmodulized imlib)
    29
    30 AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[
    31 diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in
    32 --- imlib-1.9.15.orig/imlib-config.in 2004-08-27 19:03:11.000000000 +0300
    33 +++ imlib-1.9.15/imlib-config.in 2007-02-05 23:46:34.000000000 +0200
    34 @@ -46,15 +46,9 @@
    35 echo @VERSION@
    36 ;;
    37 --cflags)
    38 - if test @includedir@ != /usr/include ; then
    39 - includes=-I@includedir@
    40 - fi
    41 echo $includes @X_CFLAGS@
    42 ;;
    43 --cflags-gdk)
    44 - if test @includedir@ != /usr/include ; then
    45 - includes=-I@includedir@
    46 - fi
    47 echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
    48 ;;
    49 --libs)
    50 diff -ur imlib-1.9.15.orig/imlib.m4 imlib-1.9.15/imlib.m4
    51 --- imlib-1.9.15.orig/imlib.m4 2004-08-27 19:03:11.000000000 +0300
    52 +++ imlib-1.9.15/imlib.m4 2007-02-05 23:42:57.000000000 +0200
    53 @@ -6,7 +6,7 @@
    54 dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
    55 dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
    56 dnl
    57 -AC_DEFUN(AM_PATH_IMLIB,
    58 +AC_DEFUN([AM_PATH_IMLIB],
    59 [dnl
    60 dnl Get the cflags and libraries from the imlib-config script
    61 dnl
    62 @@ -164,7 +164,7 @@
    63 ])
    64
    65 # Check for gdk-imlib
    66 -AC_DEFUN(AM_PATH_GDK_IMLIB,
    67 +AC_DEFUN([AM_PATH_GDK_IMLIB],
    68 [dnl
    69 dnl Get the cflags and libraries from the imlib-config script
    70 dnl