Add built-in support for udhcp and dhclient plugins

diff --git a/bootstrap-configure b/bootstrap-configure
index e73f5eb..bef329d 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -22,8 +22,8 @@ fi
                --enable-wifi=builtin \
                --enable-bluetooth=builtin \
                --enable-modemmgr \
-               --enable-udhcp \
-               --enable-dhclient \
+               --enable-udhcp=builtin \
+               --enable-dhclient=builtin \
                --enable-resolvconf=builtin \
                --enable-dnsproxy=builtin \
                --enable-novatel \

diff --git a/configure.ac b/configure.ac
index 3b12175..1488820 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,8 @@ if (test "${enable_udhcp}" = "yes"); then
                AC_SUBST(UDHCPC)
        fi
 fi
-AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" = "yes")
+AM_CONDITIONAL(UDHCP, test "${enable_udhcp}" != "no")
+AM_CONDITIONAL(UDHCP_BUILTIN, test "${enable_udhcp}" = "builtin")
 
 AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM],
        [specify location of dhclient binary]), [path_dhclient=${withval}])
@@ -102,7 +103,8 @@ if (test "${enable_dhclient}" = "yes"); then
                AC_SUBST(DHCLIENT)
        fi
 fi
-AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" = "yes")
+AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" != "no")
+AM_CONDITIONAL(DHCLIENT_BUILTIN, test "${enable_dhclient}" = "builtin")
 
 AC_ARG_WITH(resolvconf, AC_HELP_STRING([--with-resolvconf=PROGRAM],
        [specify location of resolvconf binary]), [path_resolvconf=${withval}])

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ed14ac2..f3d6d1e 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -69,18 +69,30 @@ hso_la_SOURCES = hso.c modem.h modem.c
 endif
 
 if UDHCP
+if UDHCP_BUILTIN
+builtin_modules += udhcp
+builtin_sources += udhcp.c inet.h inet.c task.h task.c
+builtin_cflags += -DUDHCPC=\"@UDHCPC@\"
+else
 plugin_LTLIBRARIES += udhcp.la
 udhcp_la_SOURCES = udhcp.c inet.h inet.c task.h task.c
 udhcp_la_CFLAGS = $(AM_CFLAGS) -DUDHCPC=\"@UDHCPC@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 endif
+endif
 
 if DHCLIENT
+if DHCLIENT_BUILTIN
+builtin_modules += dhclient
+builtin_sources += dhclient.c inet.h inet.c
+builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
+else
 plugin_LTLIBRARIES += dhclient.la
 dhclient_la_SOURCES = dhclient.c inet.h inet.c
 dhclient_la_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 endif
+endif
 
 if PPPD
 plugin_LTLIBRARIES += pppd.la
@@ -138,7 +150,9 @@ noinst_LTLIBRARIES = libbuiltin.la
 
 libbuiltin_la_SOURCES = $(builtin_sources)
 libbuiltin_la_LDFLAGS =
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) $(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN
+libbuiltin_la_CFLAGS = $(AM_CFLAGS) \
+               $(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN \
+               -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 
 BUILT_SOURCES = builtin.h