This email list is read-only. Emails sent to this list will be discarded ---------------------------------- Makefile.am | 2 ++ bootstrap-configure | 2 ++ configure.ac | 20 ++++++++++++++++---- plugins/Makefile.am | 11 +++++++++-- 4 files changed, 29 insertions(+), 6 deletions(-)
New commits: commit e2bef6e12a0fdbbe5bea8adf23de1c589e9207e7 Author: Marcel Holtmann <[email protected]> Date: Sat Jan 3 03:14:58 2009 +0100 Add configure options for udhcp and dhclient Diff in this email is a maximum of 400 lines. diff --git a/Makefile.am b/Makefile.am index 12669d6..d30424e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ pkgconfig_DATA = connman.pc DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-loopback \ --enable-wifi \ + --enable-udhcp \ + --enable-dhclient \ --enable-novatel \ --enable-huawei \ --enable-hso \ diff --git a/bootstrap-configure b/bootstrap-configure index 63bdf08..c9d8ebe 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -18,6 +18,8 @@ fi --sysconfdir=/etc \ --enable-loopback \ --enable-wifi \ + --enable-udhcp \ + --enable-dhclient \ --enable-novatel \ --enable-huawei \ --enable-hso \ diff --git a/configure.ac b/configure.ac index e6028d7..6e461de 100644 --- a/configure.ac +++ b/configure.ac @@ -46,10 +46,6 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads], [enable threading support]), [enable_threads=${enableval}]) -AC_PATH_PROG(UDHCPC, [udhcpc], [], $PATH:/sbin:/usr/sbin) -AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin) -AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin) - AC_ARG_ENABLE(loopback, AC_HELP_STRING([--enable-loopback], [enable loopback support]), [enable_loopback=${enableval}]) AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" = "yes") @@ -62,6 +58,22 @@ if (test "${enable_wifi}" = "yes"); then fi AM_CONDITIONAL(WIFI, test "${enable_wifi}" = "yes") +AC_ARG_ENABLE(UDHCP, AC_HELP_STRING([--enable-udhcp], + [enable uDHCP support]), [enable_udhcp=${enableval}]) +if (test "${enable_udhcp}" = "yes"); then + AC_PATH_PROG(UDHCPC, [udhcpc], [], $PATH:/sbin:/usr/sbin) +fi +AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" = "yes") + +AC_ARG_ENABLE(DHCLIENT, AC_HELP_STRING([--enable-dhclient], + [enable dhclient support]), [enable_dhclient=${enableval}]) +if (test "${enable_dhclient}" = "yes"); then + AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin) +fi +AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" = "yes") + +AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin) + AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel], [enable Novatel support]), [enable_novatel=${enableval}]) AM_CONDITIONAL(NOVATEL, test "${enable_novatel}" = "yes") diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e737625..597da4b 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -2,8 +2,7 @@ plugindir = $(libdir)/connman/plugins plugin_LTLIBRARIES = ethernet.la bluetooth.la \ - ipv4.la udhcp.la dhclient.la \ - dnsproxy.la resolvconf.la resolvfile.la + ipv4.la dnsproxy.la resolvconf.la resolvfile.la if LOOPBACK plugin_LTLIBRARIES += loopback.la @@ -43,13 +42,21 @@ endif ipv4_la_SOURCES = ipv4.c inet.h inet.c +if UDHCP +plugin_LTLIBRARIES += udhcp.la + udhcp_la_SOURCES = udhcp.c inet.h inet.c task.h task.c udhcp_la_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DUDHCPC=\"@udh...@\" \ -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\" +endif + +if DHCLIENT +plugin_LTLIBRARIES += dhclient.la dhclient_la_SOURCES = dhclient.c inet.h inet.c dhclient_la_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DDHCLIENT=\"@dhcli...@\" \ -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\" +endif if PPPD plugin_LTLIBRARIES += pppd.la _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
