Fix build issue with dhclient-test utility
authorMarcel Holtmann <marcel@holtmann.org>
Thu, 29 Jul 2010 23:27:55 +0000 (16:27 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 29 Jul 2010 23:27:55 +0000 (16:27 -0700)
Makefile.am

index 875da95..ab979f2 100644 (file)
@@ -124,7 +124,7 @@ if TOOLS
 noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-test \
                        tools/addr-test tools/tap-test tools/resolv-test \
                        tools/dbus-test tools/polkit-test tools/portal-test \
-                       tools/iptables-test tools/dhclient-test tools/wpad-test
+                       tools/iptables-test tools/wpad-test
 
 tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
 
@@ -151,8 +151,15 @@ tools_portal_test_LDADD = @GLIB_LIBS@
 
 tools_iptables_test_LDADD = @IPTC_LIBS@ -lip4tc -lxtables
 
-tools_dhclient_test_SOURCES = $(gdbus_sources) tools/dhclient-test.c
+if DHCLIENT
+noinst_PROGRAMS += tools/dhclient-test
+
+tools_dhclient_test_SOURCES = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
+                                                       tools/dhclient-test.c
 tools_dhclient_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_dhclient_test_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\"
+endif
 endif
 
 test_scripts = test/get-state test/list-profiles test/list-services \