diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-02-05 08:38:23 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-02-05 08:38:23 +0100 |
| commit | 7fbee6ce27176bfc7ae9b34a4de9452cf5f6fa43 (patch) | |
| tree | 5cabb0ab457846912d99ef675160be0dce4fbe6f /configure.ac | |
| parent | dc645b92b9a7db3076ae34986ac219d01677d124 (diff) | |
Imported Upstream version 0.4+git.20110124t203624.00b6cceupstream/0.4+git.20110124t203624.00b6cce
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index b763d7b..4f8b94f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ AC_PREREQ(2.52) AC_INIT(ModemManager, 0.4, dcbw@redhat.com, ModemManager) AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_CONFIG_MACRO_DIR([m4]) @@ -26,7 +27,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) IT_PROG_INTLTOOL([0.35.0]) AM_GLIB_GNU_GETTEXT -PKG_CHECK_MODULES(MM, dbus-glib-1 >= 0.75 glib-2.0 >= 2.18 gmodule-2.0 gobject-2.0) +PKG_CHECK_MODULES(MM, dbus-glib-1 >= 0.86 glib-2.0 >= 2.18 gmodule-2.0 gobject-2.0) PKG_CHECK_MODULES(GUDEV, gudev-1.0) AC_SUBST(GUDEV_CFLAGS) @@ -63,12 +64,22 @@ case $with_polkit in AC_DEFINE(WITH_POLKIT, 1, [Define if you want to use PolicyKit]) AC_SUBST(POLKIT_CFLAGS) AC_SUBST(POLKIT_LIBS) + + # Check for polkit_authority_get_sync() + AC_CHECK_LIB([polkit-gobject-1], [polkit_authority_get_sync], ac_have_pk_auth_get_sync="1", ac_have_pk_auth_get_sync="0") + AC_DEFINE_UNQUOTED(HAVE_POLKIT_AUTHORITY_GET_SYNC, $ac_have_pk_auth_get_sync, [Define if you have a polkit with polkit_authority_get_sync()]) ;; *) with_polkit=no ;; esac +dnl +dnl Checks for new dbus-glib property access function +dnl +AC_CHECK_LIB([dbus-glib-1], [dbus_glib_global_set_disable_legacy_property_access], ac_have_dg_prop="1", ac_have_dg_prop="0") +AC_DEFINE_UNQUOTED(HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS, $ac_have_dg_prop, [Define if you have a dbus-glib with dbus_glib_global_set_disable_legacy_property_access()]) + # PPPD AC_CHECK_HEADERS(pppd/pppd.h, have_pppd_headers="yes", have_pppd_headers="no") AM_CONDITIONAL(HAVE_PPPD_H, test "x$have_pppd_headers" = "xyes") @@ -115,18 +126,6 @@ NM_COMPILER_WARNINGS dnl -dnl dbus-glib >= 0.86 is required for Location API support -dnl -with_location_api=no -PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.86, with_location_api="yes", with_location_api="no") -if test x"$with_location_api" = xyes; then - AC_DEFINE(LOCATION_API, 1, [Define if you have dbus-glib 0.86 or higher]) -else - AC_MSG_WARN([dbus-glib >= 0.86 is required for Location API support]) -fi -AM_CONDITIONAL(WITH_LOCATION_API, test "x$with_location_api" = "xyes") - -dnl dnl Distribution version string dnl AC_ARG_WITH(dist-version, AS_HELP_STRING([--with-dist-version=<mm-dist-version>], [Define the custom version (like distribution package name and revision)]), ac_distver=$withval, ac_distver="") |