[Xfce4-commits] <exo:exo-helper-overhaul> Fix distcheck with external gio module.

[Nick Schermer]

Updating branch refs/heads/exo-helper-overhaul
         to 8d82d52e199b8dfc8ef99763d203daaa6c4ed688 (commit)
       from a8c711840c69e434ea7b436cc9c84444328faadd (commit)

commit 8d82d52e199b8dfc8ef99763d203daaa6c4ed688
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Aug 26 22:46:47 2009 +0200

    Fix distcheck with external gio module.

 Makefile.am                |    3 ++-
 configure.in.in            |    9 ++++++---
 exo-gio-module/Makefile.am |    5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index abc19cf..9500c77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ DISTCLEANFILES =							\
 DISTCHECK_CONFIGURE_FLAGS =						\
 	--enable-gtk-doc						\
 	--enable-xml2po							\
-	--enable-xsltproc
+	--enable-xsltproc						\
+	--with-gio-module-dir=distcheck
 
 # vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/configure.in.in b/configure.in.in
index 14dc330..0eab2fb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -169,12 +169,15 @@ AC_ARG_WITH([gio-module-dir],
             [AC_HELP_STRING([--with-gio-module-dir=PATH],
                             [Specify where to install the exo gio module (default=autodetect)])],
             [gio_module_dir="$withval"])
-if test "x$gio_module_dir" = "x"; then
+if test x"$gio_module_dir" = x""; then
   GIOMODULEDIR="`$PKG_CONFIG gio-2.0 --variable giomoduledir`"
+elif test x"$gio_module_dir" = x"distcheck"; then
+  GIOMODULEDIR=""
 else
   GIOMODULEDIR="$gio_module_dir"
 fi
 AC_SUBST([GIOMODULEDIR])
+AM_CONDITIONAL([HAVE_GIO_MODULEDIR], [test x"$GIOMODULEDIR" != x""])
 
 dnl **************************************
 dnl *** Check for libnotify (optional) ***
@@ -262,7 +265,7 @@ if test x"$enable_python" != x"no"; then
     if test x"$enable_python" = x"yes"; then
       AC_MSG_ERROR([Building python explicitly requested, but cannot build python bindings])
     else
-      AC_MSG_WARN([Couldn't find either PyGTK or the Python headers, not building Python bindings])
+      AC_MSG_WARN([Could not find either PyGTK or the Python headers, not building Python bindings])
     fi
   fi
 fi
@@ -373,7 +376,7 @@ esac
 dnl ****************************************
 dnl *** Check for ELF visibility support ***
 dnl ****************************************
-AC_ARG_ENABLE([visibility], AC_HELP_STRING([--disable-visibility], [Don't use ELF visibility attributes]), [], [enable_visibility=yes])
+AC_ARG_ENABLE([visibility], AC_HELP_STRING([--disable-visibility], [Do not use ELF visibility attributes]), [], [enable_visibility=yes])
 have_gnuc_visibility=no
 if test x"$enable_visibility" != x"no"; then
   dnl Check whether the compiler supports the visibility attribute
diff --git a/exo-gio-module/Makefile.am b/exo-gio-module/Makefile.am
index 0e34f5f..2101fc6 100644
--- a/exo-gio-module/Makefile.am
+++ b/exo-gio-module/Makefile.am
@@ -7,8 +7,13 @@ INCLUDES = 								\
 	-DLIBEXECDIR=\"$(libexecdir)\"					\
 	-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\"
 
+if HAVE_GIO_MODULEDIR
 exomoduledir =								\
 	$(GIOMODULEDIR)
+else
+exomoduledir =								\
+	$(libdir)/gio/modules
+endif
 
 exomodule_LTLIBRARIES =							\
 	libexo-module-1.la