X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=cff8b478da87a2bb994ead194f0e2f7265a1bcac;hb=c2ed55115bb97ffd4770f2d49667c515f39b34e7;hp=f76f3d65e104aaea7319772ac5a908d4d3ba8854;hpb=2648219d115cdd97cbde1a497f3c5dc211a27760;p=platform%2Fupstream%2Fconnman.git diff --git a/configure.ac b/configure.ac index f76f3d6..cff8b47 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.60) -AC_INIT(connman, 0.83) +AC_INIT(connman, 1.13) 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,7 +34,7 @@ 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 ]) @@ -184,64 +184,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 +194,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}]) @@ -310,12 +258,7 @@ if (test -n "${path_systemdunit}"); then fi AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") -PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, - AC_MSG_ERROR(GnuTLS library is required)) -AC_SUBST(GNUTLS_CFLAGS) -AC_SUBST(GNUTLS_LIBS) - -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) @@ -324,16 +267,6 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]), [enable_test=${enableval}]) AM_CONDITIONAL(TEST, test "${enable_test}" = "yes") -AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng], - [enable capabilities support]), [enable_capng=${enableval}]) -if (test "${enable_capng}" = "yes"); then - PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes, - AC_MSG_ERROR(Capabilities library is required)) - AC_SUBST(CAPNG_CFLAGS) - AC_SUBST(CAPNG_LIBS) - AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) -fi - AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat], [enable Network Manager support]), [enable_nmcompat=${enableval}], [enable_nmcompat="no"]) @@ -352,6 +285,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}]) @@ -377,21 +315,55 @@ AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono], [enable_ofono=${enableval}]) AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no") +AC_ARG_ENABLE(dundee, AC_HELP_STRING([--disable-dundee], + [disable dundee support (Bluetooth DUN)]), + [enable_dundee=${enableval}]) +AM_CONDITIONAL(DUNDEE, test "${enable_dundee}" != "no") + AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner], [disable PACrunner support]), [enable_pacrunner=${enableval}]) AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") -AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client], - [disable command line client]), - [disable_client=${enableval}]) -AM_CONDITIONAL(CLIENT, test "${enable_client}" != "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}]) +AM_CONDITIONAL(WISPR, test "${enable_wispr}" != "no") AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools], [disable testing 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]), + [enable_client=${enableval}]) +AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") + +if (test "${enable_wispr}" != "no"); then + PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, + AC_MSG_ERROR(GnuTLS library is required)) +else + GNUTLS_CFLAGS="" + GNUTLS_LIBS="" +fi +AC_SUBST(GNUTLS_CFLAGS) +AC_SUBST(GNUTLS_LIBS) + if (test "${enable_loopback}" != "no"); then AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, AC_MSG_ERROR(inotify header files are required)) @@ -410,5 +382,17 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [enable_datafiles=${enableval}]) AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") +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_vpnc}" != "no" -o \ + "${enable_l2tp}" != "no" -o \ + "${enable_pptp}" != "no") + AC_OUTPUT(Makefile include/version.h src/connman.service - scripts/connman doc/version.xml connman.pc) + vpn/connman-vpn.service vpn/net.connman.vpn.service + scripts/connman doc/version.xml connman.pc)