diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 16:31:12 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 16:31:12 +0000 |
| commit | bb3cd7888177a4d0e23a5790d3fe26f008345164 (patch) | |
| tree | c5f3ffab312aad282b1ba6abc24a45c52bef606c /acinclude.m4 | |
| parent | 9ca184f1e81afa9b68d799ecaae4a16e09684e39 (diff) | |
Preparation for using the XML parser from GLib
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 466977cc..43b09848 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -270,14 +270,16 @@ AC_DEFUN([AC_ARG_BLUEZ], [ DBUS_CFLAGS="$DBUS_CFLAGS $DBUS_GLIB_CFLAGS" DBUS_LIBS="$DBUS_GLIB_LIBS" fi + AM_CONDITIONAL(GLIB, true) + AM_CONDITIONAL(EXPAT, false) else AC_SUBST([GLIB_CFLAGS], ['-I$(top_srcdir)/eglib']) AC_SUBST([GLIB_LIBS], ['-L$(top_builddir)/eglib -leglib']) + AM_CONDITIONAL(GLIB, false) + AM_CONDITIONAL(EXPAT, test "${expat_enable}" = "yes" && test "${expat_found}" = "yes") fi AM_CONDITIONAL(INOTIFY, test "${inotify_enable}" = "yes" && test "${inotify_found}" = "yes") - AM_CONDITIONAL(EXPAT, test "${expat_enable}" = "yes" && test "${expat_found}" = "yes") - AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(SYNC, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes") |