X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=a731c4e0bb1aaa2a7399da987cad558fa48aeeca;hb=43ac6405019817cf305ddd2abc6875ed7ef6cc16;hp=e8d3752a3c89362a600423b82e1f4ed4d40c66e0;hpb=2762e28738e25290b198498b7722cc1c74865fef;p=framework%2Fconnectivity%2Fconnman.git diff --git a/configure.ac b/configure.ac index e8d3752..a731c4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.60) -AC_INIT() +AC_INIT(connman, 0.44) -AM_INIT_AUTOMAKE(connman, 0.34) +AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -23,12 +23,16 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CC_PIE AC_PROG_INSTALL +AC_PROG_SED +AC_PROG_AWK +AM_PROG_MKDIR_P m4_define([_LT_AC_TAGCONFIG], []) m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) AC_DISABLE_STATIC AC_PROG_LIBTOOL +AC_PROG_NM AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization through compiler]), [ @@ -60,12 +64,6 @@ AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads], [enable threading support]), [enable_threads=${enableval}], [enable_threads="no"]) -AC_ARG_ENABLE(loopback, - AC_HELP_STRING([--enable-loopback], [enable loopback support]), - [enable_loopback=${enableval}], [enable_loopback="no"]) -AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no") -AM_CONDITIONAL(LOOPBACK_BUILTIN, test "${enable_loopback}" = "builtin") - AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--enable-ethernet], [enable Ethernet support]), [enable_ethernet=${enableval}], [enable_ethernet="no"]) @@ -151,6 +149,19 @@ fi AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" != "no") AM_CONDITIONAL(RESOLVCONF_BUILTIN, test "${enable_resolvconf}" = "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(dnsproxy, AC_HELP_STRING([--enable-dnsproxy], [enable DNS proxy support]), [enable_dnsproxy=${enableval}], [enable_dnsproxy="no"]) @@ -195,12 +206,6 @@ if (test "${enable_ppp}" = "yes" || test "${enable_novatel}" = "yes" || fi AM_CONDITIONAL(PPPD, test "${enable_ppp}" = "yes") -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)) - AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) @@ -218,6 +223,47 @@ if (test "${enable_iwmx}" = "yes"); then 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") @@ -245,20 +291,17 @@ AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes, [Define to 1 if you need the dbus_watch_get_unix_fd() function.])) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -DBUS_DATADIR="`$PKG_CONFIG --variable=sysconfdir dbus-1`" -if (test -z "{DBUS_DATADIR}"); then + +AC_ARG_WITH(dbusconf, AC_HELP_STRING([--with-dbusconf=PATH], + [path to D-Bus config directory]), [path_dbusconf=${withval}], + [path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"]) +if (test -z "${path_dbusconf}"); then DBUS_DATADIR="${sysconfdir}/dbus-1/system.d" else - DBUS_DATADIR="$DBUS_DATADIR/dbus-1/system.d" + DBUS_DATADIR="${path_dbusconf}/dbus-1/system.d" fi AC_SUBST(DBUS_DATADIR) -AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus']) -AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)']) - -AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat']) -AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la']) - AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit], [enable PolicyKit support]), [enable_polkit=${enableval}], [enable_polkit="no"]) @@ -290,6 +333,10 @@ if (test "${enable_tools}" = "yes"); then fi AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") +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(fake, AC_HELP_STRING([--enable-fake], [enable fake device support]), [enable_fake=${enableval}]) AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes") @@ -323,10 +370,5 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [enable_datafiles=${enableval}]) AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") -AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile - include/Makefile include/version.h - src/Makefile src/connman.service - scripts/connman scripts/Makefile - plugins/Makefile client/Makefile - tools/Makefile test/Makefile - doc/Makefile doc/version.xml connman.pc) +AC_OUTPUT(Makefile include/version.h src/connman.service + scripts/connman doc/version.xml connman.pc)