colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: polish configure.ac a bit

Browse Source
This commit is contained in:
Aleksander Morgado
2013-02-06 13:55:04 +01:00
parent 86fcfe3121
commit 596c9ea508
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@@ -86,8 +86,14 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_CFLAGS)
AC_SUBST(GUDEV_LIBS) AC_SUBST(GUDEV_LIBS)
AC_ARG_WITH(dbus-sys-dir, AS_HELP_STRING([--with-dbus-sys-dir=DIR], [where D-BUS system.d directory is])) # Some required utilities
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)
# DBus system directory
AC_ARG_WITH(dbus-sys-dir, AS_HELP_STRING([--with-dbus-sys-dir=DIR], [where D-BUS system.d directory is]))
if test -n "$with_dbus_sys_dir" ; then if test -n "$with_dbus_sys_dir" ; then
DBUS_SYS_DIR="$with_dbus_sys_dir" DBUS_SYS_DIR="$with_dbus_sys_dir"
else else
@@ -95,8 +101,8 @@ else
fi fi
AC_SUBST(DBUS_SYS_DIR) AC_SUBST(DBUS_SYS_DIR)
# udev base directory
AC_ARG_WITH(udev-base-dir, AS_HELP_STRING([--with-udev-base-dir=DIR], [where udev base directory is])) AC_ARG_WITH(udev-base-dir, AS_HELP_STRING([--with-udev-base-dir=DIR], [where udev base directory is]))
if test -n "$with_udev_base_dir" ; then if test -n "$with_udev_base_dir" ; then
UDEV_BASE_DIR="$with_udev_base_dir" UDEV_BASE_DIR="$with_udev_base_dir"
else else
@@ -104,12 +110,6 @@ else
fi fi
AC_SUBST(UDEV_BASE_DIR) AC_SUBST(UDEV_BASE_DIR)
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)
# PolicyKit # PolicyKit
AC_ARG_WITH(polkit, AS_HELP_STRING([--with-polkit], [Build with PolicyKit support])) AC_ARG_WITH(polkit, AS_HELP_STRING([--with-polkit], [Build with PolicyKit support]))
AM_CONDITIONAL(WITH_POLKIT, test "x$with_polkit" = "xyes") AM_CONDITIONAL(WITH_POLKIT, test "x$with_polkit" = "xyes")