Updating branch refs/heads/master to 1fd4d21f6367b8c5f6f472c84ca7ce4cc31d6cec (commit) from 8b30542a76bfaa209a1e200d6ce201951e50749b (commit)
commit 1fd4d21f6367b8c5f6f472c84ca7ce4cc31d6cec Author: Nick Schermer <n...@xfce.org> Date: Sun Nov 21 14:11:24 2010 +0100 Fix problem in last commit. configure.in.in | 7 ++++++- exo-gio-module/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index 7f44bfe..f1b9fc9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -155,11 +155,15 @@ dnl *** Check if we need to build the GIO module (optional) *** dnl *********************************************************** XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.18.0], [gio-unix], [GIO-Unix features], [yes]) GIOMODULEDIR="" +BUILD_GIOMODULE="" if test x"$GIO_UNIX_FOUND" = x"yes"; then dnl Do not build the module after GIO 2.27 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX_227], [gio-unix-2.0], [2.27.0], [gio-unix], [GIO-Unix too new], [yes]) if test x"$GIO_UNIX_227_FOUND" != x"yes"; then + dnl A GIO version >= 2.18 and < 2.27 was found + BUILD_GIOMODULE="yes" + dnl GIO directory for extensions AC_ARG_WITH([gio-module-dir], [AC_HELP_STRING([--with-gio-module-dir=PATH], @@ -173,7 +177,8 @@ if test x"$GIO_UNIX_FOUND" = x"yes"; then fi fi AC_SUBST([GIOMODULEDIR]) -AM_CONDITIONAL([BUILD_GIO_MODULE], [test x"$GIOMODULEDIR" != x""]) +AM_CONDITIONAL([HAVE_GIOMODULEDIR], [test x"$GIOMODULEDIR" != x""]) +AM_CONDITIONAL([BUILD_GIOMODULE], [test x"$BUILD_GIOMODULE" != x""]) dnl ********************* dnl *** Check for X11 *** diff --git a/exo-gio-module/Makefile.am b/exo-gio-module/Makefile.am index 22f60ea..bdcee93 100644 --- a/exo-gio-module/Makefile.am +++ b/exo-gio-module/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\" -if BUILD_GIO_MODULE +if BUILD_GIOMODULE -if GIOMODULEDIR +if HAVE_GIOMODULEDIR exomoduledir = \ $(GIOMODULEDIR) else _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits