diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-09 18:43:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-10 12:49:46 +0100 |
| commit | e579c1a264856ede16a14e64e8437246281be1a4 (patch) | |
| tree | 1f746162602f6fa018c6974a68241ec87ee38c5d | |
| parent | 62a8e7337b6d678e5293fbfe713f3d1806003331 (diff) | |
configure.ac: make external package checks considerably simpler
PKG_CHECK_MODULES without a third and fourth argument already issues
an error if the package is missing, and its error messages are better
than ours. Also, we don't need to AC_SUBST the CFLAGS or LIBS, the
macro already does that for us. Also, stop ignoring the error (!)
if dbus-1 or dbus-glib-1 is missing. Finally, stop underquoting.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49725
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 461d464..450cc28 100644 --- a/configure.ac +++ b/configure.ac @@ -61,34 +61,13 @@ AC_C_INLINE dnl GTK docs GTK_DOC_CHECK -dnl Check for Glib -PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no) - -if test x$have_glib = xno ; then - AC_MSG_ERROR([GLib development libraries not found]) -fi - +PKG_CHECK_MODULES([GLIB], [gobject-2.0 >= 2.30, gio-2.0 >= 2.30]) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) -AC_SUBST(GLIB_GENMARSHAL) - -dnl Check for DBus -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60, dbus-glib-1 >= 0.60], have_dbus=yes, have_dbus=no) - -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - -dnl Check for sofia -PKG_CHECK_MODULES(SOFIA_SIP_UA, sofia-sip-ua-glib >= 1.12.11) -AC_SUBST(SOFIA_SIP_UA_LIBS) -AC_SUBST(SOFIA_SIP_UA_CFLAGS) -AC_SUBST(SOFIA_SIP_UA_VERSION) - -dnl Check for telepathy-glib -PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.17.7]) -AC_SUBST(TELEPATHY_GLIB_CFLAGS) -AC_SUBST(TELEPATHY_GLIB_LIBS) +AC_SUBST([GLIB_GENMARSHAL]) + +PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60, dbus-glib-1 >= 0.60]) +PKG_CHECK_MODULES([SOFIA_SIP_UA], [sofia-sip-ua-glib >= 1.12.11]) +PKG_CHECK_MODULES([TELEPATHY_GLIB], [telepathy-glib >= 0.17.7]) dnl Check for optional IP heartbeat support AC_ARG_WITH(iphb, |