diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | Makefile.plugins | 46 | ||||
| -rwxr-xr-x | bootstrap-configure | 6 | ||||
| -rw-r--r-- | configure.ac | 87 |
4 files changed, 44 insertions, 103 deletions
diff --git a/Makefile.am b/Makefile.am index 59223648..f9663fff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,15 +237,9 @@ pkgconfig_DATA = connman.pc DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --disable-datafiles \ - --enable-loopback \ - --enable-ethernet \ - --enable-wifi \ - --enable-bluetooth \ - --enable-ofono \ - --enable-pacrunner \ - --enable-client \ --enable-hh2serial-gps \ --enable-openconnect \ + --enable-client \ --enable-tools DISTCLEANFILES = $(pkgconfig_DATA) diff --git a/Makefile.plugins b/Makefile.plugins index ebded79f..f59c213d 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -7,57 +7,26 @@ script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ @DBUS_CFLAGS@ if LOOPBACK -if LOOPBACK_BUILTIN builtin_modules += loopback builtin_sources += plugins/loopback.c -else -plugin_LTLIBRARIES += plugins/loopback.la -plugin_objects += $(plugins_loopback_la_OBJECTS) -plugins_loopback_la_CFLAGS = $(plugin_cflags) -plugins_loopback_la_LDFLAGS = $(plugin_ldflags) -endif endif if ETHERNET -if ETHERNET_BUILTIN builtin_modules += ethernet builtin_sources += plugins/ethernet.c -else -plugin_LTLIBRARIES += plugins/ethernet.la -plugin_objects += $(plugins_ethernet_la_OBJECTS) -plugins_ethernet_la_CFLAGS = $(plugin_cflags) -plugins_ethernet_la_LDFLAGS = $(plugin_ldflags) -endif endif gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ gsupplicant/supplicant.c gsupplicant/dbus.c if WIFI -if WIFI_BUILTIN builtin_modules += wifi builtin_sources += plugins/wifi.c $(gsupplicant_sources) - -else -plugin_LTLIBRARIES += plugins/wifi.la -plugin_objects += $(plugins_wifi_la_OBJECTS) -plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources) -plugins_wifi_la_CFLAGS = $(plugin_cflags) -plugins_wifi_la_LDFLAGS = $(plugin_ldflags) - -endif endif if BLUETOOTH -if BLUETOOTH_BUILTIN builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c -else -plugin_LTLIBRARIES += plugins/bluetooth.la -plugin_objects += $(plugins_bluetooth_la_OBJECTS) -plugins_bluetooth_la_CFLAGS = $(plugin_cflags) -plugins_bluetooth_la_LDFLAGS = $(plugin_ldflags) -endif endif if HH2SERIAL_GPS @@ -73,16 +42,8 @@ endif endif if OFONO -if OFONO_BUILTIN builtin_modules += ofono builtin_sources += plugins/mcc.h plugins/ofono.c -else -plugin_LTLIBRARIES += plugins/ofono.la -plugin_objects += $(plugins_ofono_la_OBJECTS) -plugins_ofono_la_SOURCES = plugins/mcc.h plugins/ofono.c -plugins_ofono_la_CFLAGS = $(plugin_cflags) -plugins_ofono_la_LDFLAGS = $(plugin_ldflags) -endif endif if OPENCONNECT @@ -191,15 +152,8 @@ endif builtin_sources += $(builtin_vpn_sources) if PACRUNNER -if PACRUNNER_BUILTIN builtin_modules += pacrunner builtin_sources += plugins/pacrunner.c -else -plugin_LTLIBRARIES += plugins/pacrunner.la -plugin_objects += $(plugins_pacrunner_la_OBJECTS) -plugins_pacrunner_la_CFLAGS = $(plugin_cflags) -plugins_pacrunner_la_LDFLAGS = $(plugin_ldflags) -endif endif if POLKIT diff --git a/bootstrap-configure b/bootstrap-configure index ef5214a5..59a64e59 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -16,14 +16,8 @@ fi --localstatedir=/var \ --sysconfdir=/etc \ --disable-datafiles \ - --enable-loopback=builtin \ - --enable-ethernet=builtin \ - --enable-wifi=builtin \ - --enable-bluetooth=builtin \ - --enable-ofono=builtin \ --enable-openconnect=builtin \ --enable-openvpn=builtin \ - --enable-pacrunner=builtin \ --enable-nmcompat=builtin \ --enable-polkit=builtin \ --enable-capng \ diff --git a/configure.ac b/configure.ac index ea619a21..120d72f2 100644 --- a/configure.ac +++ b/configure.ac @@ -61,40 +61,16 @@ AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads], [enable threading support]), [enable_threads=${enableval}], [enable_threads="no"]) -AC_ARG_ENABLE(ethernet, - AC_HELP_STRING([--enable-ethernet], [enable Ethernet support]), - [enable_ethernet=${enableval}], [enable_ethernet="no"]) -AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no") -AM_CONDITIONAL(ETHERNET_BUILTIN, test "${enable_ethernet}" = "builtin") - -AC_ARG_ENABLE(wifi, - AC_HELP_STRING([--enable-wifi], [enable WiFi support]), - [enable_wifi=${enableval}], [enable_wifi="no"]) if (test "${enable_wifi}" != "no"); then AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], [], $PATH:/sbin:/usr/sbin) fi -AM_CONDITIONAL(WIFI, test "${enable_wifi}" != "no") -AM_CONDITIONAL(WIFI_BUILTIN, test "${enable_wifi}" = "builtin") - -AC_ARG_ENABLE(bluetooth, - AC_HELP_STRING([--enable-bluetooth], [enable Bluetooth support]), - [enable_bluetooth=${enableval}], [enable_bluetooth="no"]) -AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no") -AM_CONDITIONAL(BLUETOOTH_BUILTIN, test "${enable_bluetooth}" = "builtin") - AC_ARG_ENABLE(hh2serial-gps, AC_HELP_STRING([--enable-hh2serial-gps], [enable hh2serial GPS support]), [enable_hh2serial_gps=${enableval}], [enable_hh2serial_gps="no"]) AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no") AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin") -AC_ARG_ENABLE(ofono, - AC_HELP_STRING([--enable-ofono], [enable oFono support]), - [enable_ofono=${enableval}], [enable_ofono="no"]) -AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no") -AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin") - AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM], [specify location of openconnect binary]), [path_openconnect=${withval}]) @@ -199,26 +175,6 @@ 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"]) -if (test "${enable_loopback}" != "no"); then - AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, - AC_MSG_ERROR(inotify header files are required)) - - AC_CHECK_LIB(c, inotify_init, dummy=yes, - AC_MSG_ERROR(inotify library support is required)) -fi -AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no") -AM_CONDITIONAL(LOOPBACK_BUILTIN, test "${enable_loopback}" = "builtin") - -AC_ARG_ENABLE(pacrunner, - AC_HELP_STRING([--enable-pacrunner], [enable PAC runner support]), - [enable_pacrunner=${enableval}], [enable_pacrunner="no"]) - -AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") -AM_CONDITIONAL(PACRUNNER_BUILTIN, test "${enable_pacrunner}" = "builtin") - AC_CHECK_HEADERS(resolv.h, dummy=yes, AC_MSG_ERROR(resolver header files are required)) AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ @@ -414,6 +370,49 @@ if (test "${enable_capng}" = "yes"); then AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) fi +AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback], + [disable loopback support]), + [enable_loopback=${enableval}]) +AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no") + +AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--disable-ethernet], + [disable Ethernet support]), + [enable_ethernet=${enableval}]) +AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no") + +AC_ARG_ENABLE(wifi, AC_HELP_STRING([--disable-wifi], + [disable WiFi support]), + [enable_wifi=${enableval}]) +AM_CONDITIONAL(WIFI, test "${enable_wifi}" != "no") + +AC_ARG_ENABLE(BLUETOOTH, AC_HELP_STRING([--disable-bluetooth], + [disable Bluetooth support]), + [enable_bluetooth=${enableval}]) +AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no") + +AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono], + [disable oFono support]), + [enable_ofono=${enableval}]) +AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no") + +AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner], + [disable PACrunner support]), + [enable_pacrunner=${enableval}]) +AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") + +if (test "${enable_loopback}" != "no"); then + AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, + AC_MSG_ERROR(inotify header files are required)) + + AC_CHECK_LIB(c, inotify_init, dummy=yes, + AC_MSG_ERROR(inotify library support is required)) +fi + +if (test "${enable_wifi}" != "no"); then + AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], [], + $PATH:/sbin:/usr/sbin) +fi + AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [don't install configuration and data files]), [enable_datafiles=${enableval}]) |