df274f4
--- imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 14:59:33.000000000 +0100
08a9d8e
+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 14:58:42.000000000 +0100
08a9d8e
@@ -87,7 +87,7 @@
mjk 9b6aff4
 
08a9d8e
 
08a9d8e
 libgdk_imlib_la_LDFLAGS = -version-info 10:15:9
08a9d8e
-libgdk_imlib_la_LIBADD = $(GX_LIBS)
08a9d8e
+libgdk_imlib_la_LIBADD = $(GX_LIBS) local-hack-gmodule/libgmodule-local.la
mjk 9b6aff4
 
mjk 9b6aff4
 
mjk 9b6aff4
 include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
08a9d8e
--- imlib-1.9.15/configure.in	2007-03-27 15:01:15.000000000 +0100
08a9d8e
+++ imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
08a9d8e
@@ -32,56 +32,12 @@
mjk 9b6aff4
 	fi
mjk 9b6aff4
 ])
mjk 9b6aff4
 
mjk 9b6aff4
-dynworks=false
mjk 9b6aff4
-if test x$with_modules = xno; then
mjk 9b6aff4
-	AC_MSG_RESULT(no)
mjk 9b6aff4
-else 
mjk 9b6aff4
-	AC_MSG_RESULT(yes)
mjk 9b6aff4
-
mjk 9b6aff4
-if test "x$GDK_IMLIB" != x; then
mjk 9b6aff4
-  oLIBS="$LIBS"
mjk 9b6aff4
-  oCFLAGS="$CFLAGS"
mjk 9b6aff4
-  LIBS="$LIBS `glib-config --libs gmodule`"
mjk 9b6aff4
-  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
mjk 9b6aff4
-  AC_TRY_RUN([
mjk 9b6aff4
-#include <glib.h>
mjk 9b6aff4
-#include <gmodule.h>
mjk 9b6aff4
-main ()
mjk 9b6aff4
-{
mjk 9b6aff4
-    if (g_module_supported ())
mjk 9b6aff4
-        exit (0);
mjk 9b6aff4
-    else
mjk 9b6aff4
-        exit (1);
mjk 9b6aff4
-}
mjk 9b6aff4
-], dynworks=true)
mjk 9b6aff4
-  LIBS="$oLIBS"
mjk 9b6aff4
-  CFLAGS="$oCFLAGS"
mjk 9b6aff4
-fi
mjk 9b6aff4
-
mjk 9b6aff4
-dnl Now we check to see if our libtool supports shared lib deps
mjk 9b6aff4
-dnl (in a rather ugly way even)
08a9d8e
-builddir=`pwd`
mjk 9b6aff4
-if $dynworks; then
08a9d8e
-   imlib_libtool_config="$builddir/libtool --config"
mjk 9b6aff4
-   imlib_deplibs_check=`$imlib_libtool_config | \
mjk 9b6aff4
-      grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
mjk 9b6aff4
-      sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
mjk 9b6aff4
-   if test "x$imlib_deplibs_check" = "xnone" || \
mjk 9b6aff4
-      test "x$imlib_deplibs_check" = "xunknown" || \
mjk 9b6aff4
-      test "x$imlib_deplibs_check" = "x"; then
mjk 9b6aff4
-      dynworks=false
mjk 9b6aff4
-   fi
mjk 9b6aff4
-fi
mjk 9b6aff4
-
mjk 9b6aff4
-if $dynworks; then
08a9d8e
-   AC_DEFINE(USE_GMODULE, 1, [ ])
mjk 9b6aff4
-   GMODULE_LIBS="`glib-config --libs gmodule`"
mjk 9b6aff4
-   GMODULE_FLAGS="`glib-config --cflags gmodule`"
mjk 9b6aff4
-   AC_SUBST(GMODULE_LIBS)
mjk 9b6aff4
-   AC_SUBST(GMODULE_FLAGS)
mjk 9b6aff4
-fi
mjk 9b6aff4
-
mjk 9b6aff4
-fi
mjk 9b6aff4
+dynworks=true
mjk 9b6aff4
+GMODULE_LIBS=
mjk 9b6aff4
+GMODULE_CFLAGS=
08a9d8e
+AC_DEFINE(USE_GMODULE, 1, [ ])
mjk 9b6aff4
+AC_SUBST(GMODULE_LIBS)
mjk 9b6aff4
+AC_SUBST(GMODULE_CFLAGS)
mjk 9b6aff4
 
mjk 9b6aff4
 AC_SUBST(TIFFLIBS)
mjk 9b6aff4
 AC_SUBST(GIFLIBS)
df274f4
--- imlib-1.9.15/configure	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/configure	2010-05-14 11:15:06.000000000 +0100
df274f4
@@ -463,7 +463,7 @@
df274f4
 # include <unistd.h>
df274f4
 #endif"
df274f4
 
df274f4
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GTK_CONFIG GTK_CFLAGS GTK_LIBS GMODULE_LIBS GMODULE_FLAGS TIFFLIBS GIFLIBS JPEGLIBS PNGLIBS GDK_IMLIB DYNAMIC_MODULES_WORK_TRUE DYNAMIC_MODULES_WORK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GX_LIBS HAVE_LIBPNG HAVE_GIF_TRUE HAVE_GIF_FALSE HAVE_TIFF_TRUE HAVE_TIFF_FALSE HAVE_PNG_TRUE HAVE_PNG_FALSE HAVE_JPEG_TRUE HAVE_JPEG_FALSE SUPPORT_LIBS GDK_SUPPORT_LIBS LIBOBJS LTLIBOBJS'
df274f4
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GTK_CONFIG GTK_CFLAGS GTK_LIBS GMODULE_LIBS GMODULE_CFLAGS TIFFLIBS GIFLIBS JPEGLIBS PNGLIBS GDK_IMLIB DYNAMIC_MODULES_WORK_TRUE DYNAMIC_MODULES_WORK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GX_LIBS HAVE_LIBPNG HAVE_GIF_TRUE HAVE_GIF_FALSE HAVE_TIFF_TRUE HAVE_TIFF_FALSE HAVE_PNG_TRUE HAVE_PNG_FALSE HAVE_JPEG_TRUE HAVE_JPEG_FALSE SUPPORT_LIBS GDK_SUPPORT_LIBS LIBOBJS LTLIBOBJS'
df274f4
 ac_subst_files=''
df274f4
 
df274f4
 # Initialize some variables set by options.
df274f4
@@ -18982,94 +18982,16 @@
df274f4
 
df274f4
 fi;
df274f4
 
df274f4
-dynworks=false
df274f4
-if test x$with_modules = xno; then
df274f4
-	echo "$as_me:$LINENO: result: no" >&5
df274f4
-echo "${ECHO_T}no" >&6
df274f4
-else
df274f4
-	echo "$as_me:$LINENO: result: yes" >&5
df274f4
-echo "${ECHO_T}yes" >&6
df274f4
-
df274f4
-if test "x$GDK_IMLIB" != x; then
df274f4
-  oLIBS="$LIBS"
df274f4
-  oCFLAGS="$CFLAGS"
df274f4
-  LIBS="$LIBS `glib-config --libs gmodule`"
df274f4
-  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
df274f4
-  if test "$cross_compiling" = yes; then
df274f4
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
df274f4
-See \`config.log' for more details." >&5
df274f4
-echo "$as_me: error: cannot run test program while cross compiling
df274f4
-See \`config.log' for more details." >&2;}
df274f4
-   { (exit 1); exit 1; }; }
df274f4
-else
df274f4
-  cat >conftest.$ac_ext <<_ACEOF
df274f4
-/* confdefs.h.  */
df274f4
-_ACEOF
df274f4
-cat confdefs.h >>conftest.$ac_ext
df274f4
-cat >>conftest.$ac_ext <<_ACEOF
df274f4
-/* end confdefs.h.  */
df274f4
-
df274f4
-#include <glib.h>
df274f4
-#include <gmodule.h>
df274f4
-main ()
df274f4
-{
df274f4
-    if (g_module_supported ())
df274f4
-        exit (0);
df274f4
-    else
df274f4
-        exit (1);
df274f4
-}
df274f4
-
df274f4
-_ACEOF
df274f4
-rm -f conftest$ac_exeext
df274f4
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
df274f4
-  (eval $ac_link) 2>&5
df274f4
-  ac_status=$?
df274f4
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
df274f4
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
df274f4
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
df274f4
-  (eval $ac_try) 2>&5
df274f4
-  ac_status=$?
df274f4
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
df274f4
-  (exit $ac_status); }; }; then
df274f4
-  dynworks=true
df274f4
-else
df274f4
-  echo "$as_me: program exited with status $ac_status" >&5
df274f4
-echo "$as_me: failed program was:" >&5
df274f4
-sed 's/^/| /' conftest.$ac_ext >&5
df274f4
-
df274f4
-fi
df274f4
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
df274f4
-fi
df274f4
-  LIBS="$oLIBS"
df274f4
-  CFLAGS="$oCFLAGS"
df274f4
-fi
df274f4
-
df274f4
-builddir=`pwd`
df274f4
-if $dynworks; then
df274f4
-   imlib_libtool_config="$builddir/libtool --config"
df274f4
-   imlib_deplibs_check=`$imlib_libtool_config | \
df274f4
-      grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \
df274f4
-      sed 's/.*['\''"]\(.*\)['\''"]$/\1/'`
df274f4
-   if test "x$imlib_deplibs_check" = "xnone" || \
df274f4
-      test "x$imlib_deplibs_check" = "xunknown" || \
df274f4
-      test "x$imlib_deplibs_check" = "x"; then
df274f4
-      dynworks=false
df274f4
-   fi
df274f4
-fi
df274f4
-
df274f4
-if $dynworks; then
df274f4
+dynworks=true
df274f4
+GMODULE_LIBS=
df274f4
+GMODULE_CFLAGS=
df274f4
 
df274f4
 cat >>confdefs.h <<\_ACEOF
df274f4
 #define USE_GMODULE 1
df274f4
 _ACEOF
df274f4
 
df274f4
-   GMODULE_LIBS="`glib-config --libs gmodule`"
df274f4
-   GMODULE_FLAGS="`glib-config --cflags gmodule`"
df274f4
 
df274f4
 
df274f4
-fi
df274f4
-
df274f4
-fi
df274f4
 
df274f4
 
df274f4
 
df274f4
@@ -24928,7 +24850,7 @@
df274f4
 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
df274f4
 s,@GTK_LIBS@,$GTK_LIBS,;t t
df274f4
 s,@GMODULE_LIBS@,$GMODULE_LIBS,;t t
df274f4
-s,@GMODULE_FLAGS@,$GMODULE_FLAGS,;t t
df274f4
+s,@GMODULE_CFLAGS@,$GMODULE_CFLAGS,;t t
df274f4
 s,@TIFFLIBS@,$TIFFLIBS,;t t
df274f4
 s,@GIFLIBS@,$GIFLIBS,;t t
df274f4
 s,@JPEGLIBS@,$JPEGLIBS,;t t
df274f4
--- imlib-1.9.15/config/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/config/Makefile.in	2010-05-14 11:15:08.000000000 +0100
df274f4
@@ -91,7 +91,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@
df274f4
--- imlib-1.9.15/doc/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/doc/Makefile.in	2010-05-14 11:15:08.000000000 +0100
df274f4
@@ -81,7 +81,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@
df274f4
--- imlib-1.9.15/gdk_imlib/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/gdk_imlib/Makefile.in	2010-05-14 11:15:08.000000000 +0100
df274f4
@@ -60,7 +60,8 @@
df274f4
 moduleLTLIBRARIES_INSTALL = $(INSTALL)
df274f4
 LTLIBRARIES = $(lib_LTLIBRARIES) $(module_LTLIBRARIES)
df274f4
 am__DEPENDENCIES_1 =
df274f4
-libgdk_imlib_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
df274f4
+libgdk_imlib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
df274f4
+	local-hack-gmodule/libgmodule-local.la
df274f4
 am_libgdk_imlib_la_OBJECTS = cache.lo colors.lo globals.lo load.lo \
df274f4
 	misc.lo rend.lo utils.lo save.lo modules.lo
df274f4
 libgdk_imlib_la_OBJECTS = $(am_libgdk_imlib_la_OBJECTS)
df274f4
@@ -169,7 +170,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@
df274f4
@@ -322,7 +323,7 @@
df274f4
 	modules.c
df274f4
 
df274f4
 libgdk_imlib_la_LDFLAGS = -version-info 10:15:9
df274f4
-libgdk_imlib_la_LIBADD = $(GX_LIBS)
df274f4
+libgdk_imlib_la_LIBADD = $(GX_LIBS) local-hack-gmodule/libgmodule-local.la
df274f4
 include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
df274f4
 INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. \
df274f4
 	$(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS) 
df274f4
--- imlib-1.9.15/Imlib/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/Imlib/Makefile.in	2010-05-14 11:15:08.000000000 +0100
df274f4
@@ -137,7 +137,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@
df274f4
--- imlib-1.9.15/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/Makefile.in	2010-05-14 11:15:09.000000000 +0100
df274f4
@@ -126,7 +126,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@
df274f4
--- imlib-1.9.15/utils/Makefile.in	2010-05-14 11:12:48.000000000 +0100
df274f4
+++ imlib-1.9.15/utils/Makefile.in	2010-05-14 11:15:09.000000000 +0100
df274f4
@@ -107,7 +107,7 @@
df274f4
 GDK_IMLIB = @GDK_IMLIB@
df274f4
 GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
df274f4
 GIFLIBS = @GIFLIBS@
df274f4
-GMODULE_FLAGS = @GMODULE_FLAGS@
df274f4
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
df274f4
 GMODULE_LIBS = @GMODULE_LIBS@
df274f4
 GTK_CFLAGS = @GTK_CFLAGS@
df274f4
 GTK_CONFIG = @GTK_CONFIG@