X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=cd2013f4efdc0b6ae499e96f9338ee41d30f0003;hb=20b67692553b2b41bc520a6959537bb09c1cad55;hp=826b3e684b6f4f104cb8f4d6ac975f1b83717420;hpb=7e151a7520740b586fe4f2adad1aa21864ef5321;p=platform%2Fupstream%2Fconnman.git diff --git a/configure.ac b/configure.ac old mode 100644 new mode 100755 index 826b3e6..cd2013f --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.60) -AC_INIT(connman, 1.6) +AC_INIT(connman, 1.29) AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -23,7 +23,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CC_PIE AC_PROG_INSTALL -AM_PROG_MKDIR_P +AC_PROG_MKDIR_P m4_define([_LT_AC_TAGCONFIG], []) m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) @@ -34,12 +34,10 @@ AC_PROG_LIBTOOL AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization through compiler]), [ if (test "${enableval}" = "no"); then - CFLAGS="$CFLAGS -O0" + CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE" fi ]) -GTK_DOC_CHECK - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [ if (test "${enableval}" = "yes" && @@ -57,16 +55,18 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], fi ]) -AC_ARG_ENABLE(threads, - AC_HELP_STRING([--enable-threads], [enable threading support]), - [enable_threads=${enableval}], [enable_threads="no"]) - 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(telephony, + AC_HELP_STRING([--enable-telephony], [enable Telephony support]), + [enable_telephony=${enableval}], [enable_telephony="yes"]) +AM_CONDITIONAL(TELEPHONY, test "${enable_telephony}" != "no") +AM_CONDITIONAL(TELEPHONY_BUILTIN, test "${enable_telephony}" = "builtin") + AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM], [specify location of openconnect binary]), [path_openconnect=${withval}]) @@ -107,6 +107,34 @@ fi AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no") AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin") +AC_ARG_WITH(ipsec, AC_HELP_STRING([--with-ipsec=PROGRAM], + [specify location of ipsec binary]), [path_ipsec=${withval}]) + +AC_ARG_ENABLE(ipsec, + AC_HELP_STRING([--enable-ipsec], [enable ipsec support]), + [enable_ipsec=${enableval}], [enable_ipsec="no"]) +if (test "${enable_ipsec}" != "no"); then + PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.28, dummy=yes, + AC_MSG_ERROR(GIO >= 2.28 is required)) + AC_SUBST(GIO_CFLAGS) + AC_SUBST(GIO_LIBS) + PKG_CHECK_MODULES(OPENSSL, openssl, dummy=yes, + AC_MSG_ERROR(openssl library is required)) + AC_SUBST(OPENSSL_CFLAGS) + AC_SUBST(OPENSSL_LIBS) + if (test -z "${path_ipsec}"); then + AC_PATH_PROG(IPSEC, [charon], [/usr/bin/charon], $PATH:/usr/bin) + if (test -z "${IPSEC}"); then + AC_MSG_ERROR(ipsec binary not found) + fi + else + IPSEC="${path_ipsec}" + AC_SUBST(IPSEC) + fi +fi +AM_CONDITIONAL(IPSEC, test "${enable_ipsec}" != "no") +AM_CONDITIONAL(IPSEC_BUILTIN, test "${enable_ipsec}" = "builtin") + AC_ARG_WITH(vpnc, AC_HELP_STRING([--with-vpnc=PROGRAM], [specify location of vpnc binary]), [path_vpnc=${withval}]) @@ -127,6 +155,9 @@ fi AM_CONDITIONAL(VPNC, test "${enable_vpnc}" != "no") AM_CONDITIONAL(VPNC_BUILTIN, test "${enable_vpnc}" = "builtin") +AC_ARG_WITH(l2tp, AC_HELP_STRING([--with-l2tp=PROGRAM], + [specify location of l2tp binary]), [path_l2tp=${withval}]) + AC_ARG_ENABLE(l2tp, AC_HELP_STRING([--enable-l2tp], [enable l2tp support]), [enable_l2tp=${enableval}], [enable_l2tp="no"]) @@ -149,6 +180,9 @@ fi AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no") AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin") +AC_ARG_WITH(pptp, AC_HELP_STRING([--with-pptp=PROGRAM], + [specify location of pptp binary]), [path_pptp=${withval}]) + AC_ARG_ENABLE(pptp, AC_HELP_STRING([--enable-pptp], [enable pptp support]), [enable_pptp=${enableval}], [enable_pptp="no"]) @@ -184,64 +218,6 @@ AC_CHECK_FUNC(signalfd, dummy=yes, AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -AC_ARG_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH], - [path to Intel WiMAX SDK]), - [pkgconfig_iwmxsdk=${withval}/lib/pkgconfig]) - -AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx], - [enable Intel WiMAX support]), [enable_iwmx=${enableval}]) -if (test "${enable_iwmx}" = "yes"); then - enable_threads="yes" - export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}" - PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, dummy=yes, - AC_MSG_ERROR(Intel WiMAX SDK is required)) - PKG_CONFIG_PATH="" - AC_SUBST(IWMXSDK_CFLAGS) - AC_SUBST(IWMXSDK_LIBS) - - # Fix API compat breakage from 1.4 to 1.5... - CPPFLAGS_save=$CPPFLAGS - CPPFLAGS="$IWMXSDK_CFLAGS $CPPFLAGS" - AH_TEMPLATE([HAVE_IWMXSDK_STATUS_IDLE], - [WIMAX_API_DEVICE_STATUS_Connection_Idle is present]) - AC_CHECK_DECL(WIMAX_API_DEVICE_STATUS_Connection_Idle, - [AC_DEFINE([HAVE_IWMXSDK_STATUS_IDLE], [1], [])], - [], - [[#include ]]) - - AH_TEMPLATE([HAVE_WIMAX_API_DEVICE_ID], - [WIMAX_API_DEVICE_ID is present]) - AC_CHECK_TYPE(WIMAX_API_DEVICE_ID, - [AC_DEFINE([HAVE_WIMAX_API_DEVICE_ID], [1], [])], - [], - [[#include ]]) - - AH_TEMPLATE([HAVE_WIMAX_API_HW_DEVICE_ID], - [WIMAX_API_HW_DEVICE_ID is present]) - AC_CHECK_TYPE(WIMAX_API_HW_DEVICE_ID, - [AC_DEFINE([HAVE_WIMAX_API_HW_DEVICE_ID], [1], [])], - [], - [[#include ]]) - - AH_TEMPLATE([HAVE_WIMAX_API_NSP_INFO_EX], - [WIMAX_API_NSP_INFO_EX is present]) - AC_CHECK_TYPE(WIMAX_API_NSP_INFO_EX, - [AC_DEFINE([HAVE_WIMAX_API_NSP_INFO_EX], [1], [])], - [], - [[#include ] - [#include ]]) - - AH_TEMPLATE([HAVE_WIMAX_API_CONNECTED_NSP_INFO], - [WIMAX_API_CONNECTED_NSP_INFO is present]) - AC_CHECK_TYPE(WIMAX_API_CONNECTED_NSP_INFO, - [AC_DEFINE([HAVE_WIMAX_API_CONNECTED_NSP_INFO], [1], [])], - [], - [[#include ]]) - - CPPFLAGS=$CPPFLAGS_save -fi -AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes") - AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm], [enable Intel OSPM support]), [enable_iospm=${enableval}]) AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes") @@ -252,6 +228,12 @@ AC_ARG_ENABLE(tist, AM_CONDITIONAL(TIST, test "${enable_tist}" != "no") AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin") +AC_ARG_ENABLE(session-policy-local, + AC_HELP_STRING([--enable-session-policy-local], [enable local file Session policy configuration support]), + [enable_session_policy_local=${enableval}], [enable_session_policy_local="no"]) +AM_CONDITIONAL(SESSION_POLICY_LOCAL, test "${enable_session_policy_local}" != "no") +AM_CONDITIONAL(SESSION_POLICY_LOCAL_BUILTIN, test "${enable_session_policy_local}" = "builtin") + AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE], [Maximal size of a statistics round robin file]), [stats_max_file_size=${withval}]) @@ -268,13 +250,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -if (test "${enable_threads}" = "yes"); then - AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required]) - PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes, - AC_MSG_ERROR(GThread >= 2.16 is required)) - GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS" - GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS" -fi +PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd-daemon, dummy=yes, + AC_MSG_ERROR(libsystemd-daemon library is required)) +AC_SUBST(LIBSYSTEMD_CFLAGS) +AC_SUBST(LIBSYSTEMD_LIBS) PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes, AC_MSG_ERROR(D-Bus >= 1.4 is required)) @@ -310,11 +289,16 @@ if (test -n "${path_systemdunit}"); then fi AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") -PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes, +PKG_CHECK_MODULES(XTABLES, xtables >= 1.4.11, dummy=yes, AC_MSG_ERROR(Xtables library is required)) AC_SUBST(XTABLES_CFLAGS) AC_SUBST(XTABLES_LIBS) +PKG_CHECK_MODULES(TPKP_GNUTLS, tpkp-gnutls, dummy=yes, + AC_MSG_ERROR(tpkp-gnutls library is required)) +AC_SUBST(TPKP_GNUTLS_CFLAGS) +AC_SUBST(TPKP_GNUTLS_LIBS) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]), [enable_test=${enableval}]) AM_CONDITIONAL(TEST, test "${enable_test}" = "yes") @@ -337,6 +321,11 @@ if (test "${enable_polkit}" != "no"); then fi AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no") +AC_ARG_ENABLE(selinux, AC_HELP_STRING([--enable-selinux], + [enable selinux support]), + [enable_selinux=${enableval}], [enable_selinux="no"]) +AM_CONDITIONAL(SELINUX, test "${enable_selinux}" != "no") + AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback], [disable loopback support]), [enable_loopback=${enableval}]) @@ -347,6 +336,11 @@ AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--disable-ethernet], [enable_ethernet=${enableval}]) AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no") +AC_ARG_ENABLE(gadget, AC_HELP_STRING([--disable-gadget], + [disable USB Gadget support]), + [enable_gadget=${enableval}]) +AM_CONDITIONAL(GADGET, test "${enable_gadget}" != "no") + AC_ARG_ENABLE(wifi, AC_HELP_STRING([--disable-wifi], [disable WiFi support]), [enable_wifi=${enableval}]) @@ -372,6 +366,11 @@ AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner], [enable_pacrunner=${enableval}]) AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") +AC_ARG_ENABLE(neard, AC_HELP_STRING([--disable-neard], + [disable Neard support]), + [enable_neard=${enableval}]) +AM_CONDITIONAL(NEARD, test "${enable_neard}" != "no") + AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr], [disable WISPr support]), [enable_wispr=${enableval}]) @@ -382,9 +381,18 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools], [enable_tools=${enableval}]) AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no") +if (test "${enable_tools}" != "no"); then + AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [], + $PATH:/sbin:/usr/sbin) + IPTABLES_SAVE=$ac_cv_path_IPTABLES_SAVE +else + IPTABLES_SAVE="" +fi +AC_SUBST(IPTABLES_SAVE) + AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client], [disable command line client]), - [disable_client=${enableval}]) + [enable_client=${enableval}]) AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") if (test "${enable_wispr}" != "no"); then @@ -415,5 +423,16 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [enable_datafiles=${enableval}]) AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") -AC_OUTPUT(Makefile include/version.h src/connman.service - scripts/connman doc/version.xml connman.pc) +if (test "${enable_client}" != "no"); then + AC_CHECK_HEADERS(readline/readline.h, dummy=yes, + AC_MSG_ERROR(readline header files are required)) +fi + +AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o \ + "${enable_openvpn}" != "no" -o \ + "${enable_ipsec}" != "no" -o \ + "${enable_vpnc}" != "no" -o \ + "${enable_l2tp}" != "no" -o \ + "${enable_pptp}" != "no") + +AC_OUTPUT(Makefile include/version.h connman.pc src/connman.service src/connman_tv.service)