diff options
| author | Stefano Karapetsas <[email protected]> | 2012-05-16 02:52:20 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-05-16 02:52:20 -0700 |
| commit | 03680f2d95687c0f336993bb44663af3bb0c2ffa (patch) | |
| tree | e69764ca8614b2c0f5c8d1988bbccd6f54eeebfa | |
| parent | 896872d030fa0ab1fb7c62161c327146e0ad609a (diff) | |
| parent | 1558f59456ae8abe428c8378910e6a1f26bf9411 (diff) | |
| download | caja-03680f2d95687c0f336993bb44663af3bb0c2ffa.tar.bz2 caja-03680f2d95687c0f336993bb44663af3bb0c2ffa.tar.xz | |
Merge pull request #16 from MDykstra/master
better backward compatible dependency on gmodule-2.0
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 4e7f4c88..eb65881a 100644 --- a/configure.in +++ b/configure.in @@ -423,8 +423,8 @@ LIBCAJA_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBCAJA_EXTENSION_MODULES`" AC_SUBST(LIBCAJA_EXTENSION_LIBS) dnl core caja -CORE_MODULES="glib-2.0 gmodule-2.0 mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 -gail mateconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION" +PKG_CHECK_MODULES(GMODULE, gmodule-2.0, [GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) +CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail mateconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION" CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" |