diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2007-09-17 07:47:38 +0000 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2007-09-17 07:47:38 +0000 |
| commit | baec0934c66f9d1735055c213450f693604e9bce (patch) | |
| tree | b597dac8ffb22f2b74565767bc0ffba725ab36e6 | |
| parent | e5b1733522718da3a9370db607f7dc3516f229dc (diff) | |
Check for glib tools only after testing for glib itself.
Fixes: #1795921.
git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@136 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 12 insertions, 8 deletions
@@ -1,5 +1,9 @@ 2007-09-17 Alberto Mardegan <alberto.mardegan@nokia.com> + * configure.ac: + Check for glib tools only after testing for glib itself. + Fixes: #1795921. + * libmissioncontrol/Makefile.am: Add signal marshallers list file to EXTRA_DIST. diff --git a/configure.ac b/configure.ac index edee6268..180b8e29 100644 --- a/configure.ac +++ b/configure.ac @@ -117,14 +117,6 @@ AC_ARG_ENABLE(server, ) AM_CONDITIONAL(HAVE_SERVER, [test x$server_enabled = xyes]) -dnl *************************************************************************** -dnl Check for marshal and enum generators -dnl *************************************************************************** -GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`" -AC_SUBST(GLIB_GENMARSHAL) -GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`" -AC_SUBST(GLIB_MKENUMS) - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.51, dbus-glib-1 >= 0.51], have_dbus=yes, have_dbus=no) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -142,6 +134,14 @@ PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) +dnl *************************************************************************** +dnl Check for marshal and enum generators +dnl *************************************************************************** +GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`" +AC_SUBST(GLIB_GENMARSHAL) +GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`" +AC_SUBST(GLIB_MKENUMS) + GTK_DOC_CHECK([1.3]) pluginlibdir=$libdir/mission-control |