diff options
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | test/Makefile.am | 4 |
2 files changed, 28 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0e00632f..4d5e6f88 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,18 @@ AC_SUBST(UDEV_BASE_DIR) GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) +# 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") +case $have_pppd_headers in + yes) ;; + *) + have_pppd_headers=no + ;; +esac + +AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) + if test -n "$with_pppd_plugin_dir" ; then PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" else @@ -62,7 +74,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_CHECKING([whether gcc understands $option]) AC_TRY_COMPILE([], [], has_option=yes, - has_option=no,) + has_option=no) if test $has_option = no; then CFLAGS="$SAVE_CFLAGS" fi @@ -93,3 +105,14 @@ test/Makefile introspection/Makefile ]) AC_OUTPUT + +echo +echo Building with D-Bus system directory: ${DBUS_SYS_DIR} +echo +echo Building with udev base directory: ${UDEV_BASE_DIR} +echo +echo Building documentation: ${with_docs} +echo +echo Building PPP-enabled tests: ${have_pppd_headers} +echo + diff --git a/test/Makefile.am b/test/Makefile.am index 446b9a57..3d571c3b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,3 +1,5 @@ +if HAVE_PPPD_H + pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = mm-test-pppd-plugin.la @@ -8,6 +10,8 @@ mm_test_pppd_plugin_la_CPPFLAGS = $(MM_CFLAGS) mm_test_pppd_plugin_la_LDFLAGS = -module -avoid-version mm_test_pppd_plugin_la_LIBADD = $(MM_LIBS) +endif + noinst_PROGRAMS = lsudev lsudev_SOURCES = lsudev.c lsudev_CPPFLAGS = $(GUDEV_CFLAGS) |