service: Check the passphrase validity

[platform/upstream/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ecebbe7..6ad0b28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.77)
+AC_INIT(connman, 0.79)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
@@ -177,6 +177,28 @@ fi
 AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no")
 AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin")
 
+AC_ARG_ENABLE(pptp,
+       AC_HELP_STRING([--enable-pptp], [enable pptp support]),
+                       [enable_pptp=${enableval}], [enable_pptp="no"])
+if (test "${enable_pptp}" != "no"); then
+       if (test -z "${path_pppd}"); then
+               AC_PATH_PROG(PPPD, [pppd], [/usr/sbin/pppd], $PATH:/sbin:/usr/sbin)
+       else
+               PPPD="${path_pppd}"
+               AC_SUBST(PPPD)
+       fi
+       AC_CHECK_HEADERS(pppd/pppd.h, dummy=yes,
+                       AC_MSG_ERROR(ppp header files are required))
+       if (test -z "${path_pptp}"); then
+               AC_PATH_PROG(PPTP, [pptp], [/usr/sbin/pptp], $PATH:/sbin:/usr/sbin)
+       else
+               PPTP="${path_pptp}"
+               AC_SUBST(PPTP)
+       fi
+fi
+AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no")
+AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin")
+
 AC_ARG_ENABLE(loopback,
        AC_HELP_STRING([--enable-loopback], [enable loopback support]),
                        [enable_loopback=${enableval}], [enable_loopback="no"])
@@ -197,18 +219,6 @@ AC_ARG_ENABLE(pacrunner,
 AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no")
 AM_CONDITIONAL(PACRUNNER_BUILTIN, test "${enable_pacrunner}" = "builtin")
 
-AC_ARG_ENABLE(google,
-       AC_HELP_STRING([--enable-google], [enable Google Public DNS support]),
-                       [enable_google=${enableval}], [enable_google="no"])
-AM_CONDITIONAL(GOOGLE, test "${enable_google}" != "no")
-AM_CONDITIONAL(GOOGLE_BUILTIN, test "${enable_google}" = "builtin")
-
-AC_ARG_ENABLE(meego,
-       AC_HELP_STRING([--enable-meego], [enable MeeGo features support]),
-                       [enable_meego=${enableval}], [enable_meego="no"])
-AM_CONDITIONAL(MEEGO, test "${enable_meego}" != "no")
-AM_CONDITIONAL(MEEGO_BUILTIN, test "${enable_meego}" = "builtin")
-
 AC_CHECK_HEADERS(resolv.h, dummy=yes,
        AC_MSG_ERROR(resolver header files are required))
 AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [
@@ -284,24 +294,6 @@ AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
                [enable Intel OSPM support]), [enable_iospm=${enableval}])
 AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
 
-AC_ARG_WITH(ntpd, AC_HELP_STRING([--with-ntpd=PROGRAM],
-       [specify ntpd binary location]), [path_ntpd=${withval}])
-
-AC_ARG_ENABLE(ntpd,
-       AC_HELP_STRING([--enable-ntpd], [enable ntpd support]),
-                       [enable_ntpd=${enableval}], [enable_ntpd="no"])
-
-if (test "${enable_ntpd}" != "no"); then
-       if (test -z "${path_ntpd}"); then
-               AC_PATH_PROG(NTPD, [ntpd], [], $PATH:/sbin:/usr/sbin)
-       else
-               NTPD="${path_ntpd}"
-               AC_SUBST(NTPD)
-       fi
-fi
-AM_CONDITIONAL(NTPD, test "${enable_ntpd}" != "no")
-AM_CONDITIONAL(NTPD_BUILTIN, test "${enable_ntpd}" = "builtin")
-
 AC_ARG_ENABLE(nmcompat,
        AC_HELP_STRING([--enable-nmcompat], [enable nmcompat support]),
                        [enable_nmcompat=${enableval}], [enable_nmcompat="no"])
@@ -338,21 +330,8 @@ if (test "${enable_threads}" = "yes"); then
        GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
 fi
 
-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
-                               AC_MSG_ERROR(D-Bus >= 1.0 is required))
-saved_CFLAGS="$CFLAGS"
-saved_LIBS="$LIBS"
-CFLAGS="$CFLAGS $DBUS_CFLAGS"
-LIBS="$LIBS $DBUS_LIBS"
-AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
-       AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1,
-               [Define to 1 if you need the dbus_watch_get_unix_fd() function.]))
-AC_CHECK_LIB(dbus-1, dbus_connection_can_send_type, dummy=yes,
-       AC_DEFINE(NEED_DBUS_CONNECTION_CAN_SEND_TYPE, 1,
-               [Define to 1 if you need the dbus_connection_can_send_type() function.]
-))
-CFLAGS="$saved_CFLAGS"
-LIBS="$saved_LIBS"
+PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes,
+                               AC_MSG_ERROR(D-Bus >= 1.4 is required))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)