Add extern declarations to public functions

[connman] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2a4900c..570d95f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.5)
+AM_INIT_AUTOMAKE(connman, 0.6)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -48,6 +48,10 @@ AC_ARG_ENABLE(loopback, AC_HELP_STRING([--enable-loopback],
                [enable loopback support]), [enable_loopback=${enableval}])
 AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" = "yes")
 
+AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--enable-ethernet],
+               [enable Ethernet support]), [enable_ethernet=${enableval}])
+AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" = "yes")
+
 AC_ARG_ENABLE(wifi, AC_HELP_STRING([--enable-wifi],
                [enable WiFi support]), [enable_wifi=${enableval}])
 if (test "${enable_wifi}" = "yes"); then
@@ -56,10 +60,18 @@ if (test "${enable_wifi}" = "yes"); then
 fi
 AM_CONDITIONAL(WIFI, test "${enable_wifi}" = "yes")
 
+AC_ARG_ENABLE(wimax, AC_HELP_STRING([--enable-wimax],
+               [enable WiMAX support]), [enable_wimax=${enableval}])
+AM_CONDITIONAL(WIMAX, test "${enable_wimax}" = "yes")
+
+AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--enable-bluetooth],
+               [enable Bluetooth support]), [enable_bluetooth=${enableval}])
+AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" = "yes")
+
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
-       [specific location of udhcpc binary]), [path_udhcpc=${withval}])
+       [specify location of udhcpc binary]), [path_udhcpc=${withval}])
 
-AC_ARG_ENABLE(UDHCP, AC_HELP_STRING([--enable-udhcp],
+AC_ARG_ENABLE(udhcp, AC_HELP_STRING([--enable-udhcp],
                [enable uDHCP support]), [enable_udhcp=${enableval}])
 if (test "${enable_udhcp}" = "yes"); then
        if (test -z "${path_udhcpc}"); then
@@ -72,9 +84,9 @@ fi
 AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" = "yes")
 
 AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM],
-       [specific location of dhclient binary]), [path_dhclient=${withval}])
+       [specify location of dhclient binary]), [path_dhclient=${withval}])
 
-AC_ARG_ENABLE(DHCLIENT, AC_HELP_STRING([--enable-dhclient],
+AC_ARG_ENABLE(dhclient, AC_HELP_STRING([--enable-dhclient],
                [enable dhclient support]), [enable_dhclient=${enableval}])
 if (test "${enable_dhclient}" = "yes"); then
        if (test -z "${path_dhclient}"); then
@@ -86,7 +98,24 @@ if (test "${enable_dhclient}" = "yes"); then
 fi
 AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" = "yes")
 
-AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin)
+AC_ARG_WITH(resolvconf, AC_HELP_STRING([--with-resolvconf=PROGRAM],
+       [specify location of resolvconf binary]), [path_resolvconf=${withval}])
+
+AC_ARG_ENABLE(resolvconf, AC_HELP_STRING([--enable-resolvconf],
+               [enable resolvconf support]), [enable_resolvconf=${enableval}])
+if (test "${enable_resolvconf}" = "yes"); then
+       if (test -z "${path_resolvconf}"); then
+               AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin)
+       else
+               UDHCPC="${path_resolvconf}"
+               AC_SUBST(RESOLVCONF)
+       fi
+fi
+AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" = "yes")
+
+AC_ARG_ENABLE(dnsproxy, AC_HELP_STRING([--enable-dnsproxy],
+               [enable DNS proxy support]), [enable_dnsproxy=${enableval}])
+AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" = "yes")
 
 AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel],
                [enable Novatel support]), [enable_novatel=${enableval}])
@@ -101,7 +130,7 @@ AC_ARG_ENABLE(hso, AC_HELP_STRING([--enable-hso],
 AM_CONDITIONAL(HSO, test "${enable_hso}" = "yes")
 
 AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM],
-       [specific location of pppd binary]), [path_pppd=${withval}])
+       [specify location of pppd binary]), [path_pppd=${withval}])
 
 AC_ARG_ENABLE(ppp, AC_HELP_STRING([--enable-ppp],
                [enable PPP support]), [enable_ppp=${enableval}])