Release 0.44

[framework/connectivity/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 88488af..a731c4e 100644 (file)
--- 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.38)
+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]), [
@@ -219,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 <WiMaxType.h>]])
+
+        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 <WiMaxType.h>]])
+
+        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 <WiMaxType.h>]])
+
+        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 <WiMaxType.h>] 
+                       [#include <WiMaxTypesEx.h>]])
+
+        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 <WiMaxType.h>]])
+
+        CPPFLAGS=$CPPFLAGS_save
 fi
 AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes")
 
@@ -246,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"])
@@ -291,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")
@@ -324,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)