Add initial support for common property key constants

[connman] / configure.ac

diff --git a/configure.ac b/configure.ac
index 91c3685..4842ad2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.10)
+AM_INIT_AUTOMAKE(connman, 0.12)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -24,6 +24,8 @@ AC_PROG_LIBTOOL
 
 GTK_DOC_CHECK
 
+SHAVE_ARG_ENABLE
+
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
                        [enable compiling with debugging information]), [
        if (test "${enableval}" = "yes" &&
@@ -60,10 +62,6 @@ if (test "${enable_wifi}" = "yes"); then
 fi
 AM_CONDITIONAL(WIFI, test "${enable_wifi}" = "yes")
 
-AC_ARG_ENABLE(wimax, AC_HELP_STRING([--enable-wimax],
-               [enable WiMAX support]), [enable_wimax=${enableval}])
-AM_CONDITIONAL(WIMAX, test "${enable_wimax}" = "yes")
-
 AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--enable-bluetooth],
                [enable Bluetooth support]), [enable_bluetooth=${enableval}])
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" = "yes")
@@ -150,6 +148,46 @@ AM_CONDITIONAL(PPPD, test "${enable_ppp}" = "yes")
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
+AC_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
+               [enable udev support]), [enable_udev=${enableval}])
+if (test "${enable_udev}" = "yes"); then
+       AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
+       PKG_CHECK_MODULES(UDEV, libudev >= 129, enable_udev=yes,
+                               AC_MSG_ERROR(udev >= 129 is required))
+       AC_CHECK_LIB(udev, udev_enumerate_add_match_property, dummy=yes,
+               AC_DEFINE(NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY, 1,
+                       [Define to 1 if you need the
+                               udev_enumerate_add_match_property() function.]))
+       AC_CHECK_LIB(udev, udev_device_get_parent_with_subsystem_devtype, dummy=yes,
+               AC_DEFINE(NEED_UDEV_DEVICE_GET_PARENT_WITH_SUBSYSTEM_DEVTYPE, 1,
+                       [Define to 1 if you need the
+                               udev_device_get_parent_with_subsystem_devtype()
+                                                                       function.]))
+       UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
+       if (test -z "${UDEV_DATADIR}"); then
+               UDEV_DATADIR="${sysconfdir}/udev/rules.d"
+       fi
+       AC_SUBST(UDEV_DATADIR)
+fi
+AC_SUBST(UDEV_CFLAGS)
+AC_SUBST(UDEV_LIBS)
+AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
+
+AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
+               [enable Intel OSPM support]), [enable_iospm=${enableval}])
+AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
+
+AC_ARG_ENABLE(iwmxsdk, AC_HELP_STRING([--enable-iwmxsdk],
+               [enable Intel WiMAX support]), [enable_iwmxsdk=${enableval}])
+if (test "${enable_iwmxsdk}" = "yes"); then
+       enable_threads="yes"
+       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmxsdk=yes,
+                               AC_MSG_ERROR(Intel WiMAX SDK is required))
+       AC_SUBST(IWMXSDK_CFLAGS)
+       AC_SUBST(IWMXSDK_LIBS)
+fi
+AM_CONDITIONAL(IWMXSDK, test "${enable_iwmxsdk}" = "yes")
+
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
                                AC_MSG_ERROR(GLib >= 2.16 is required))
 AC_SUBST(GLIB_CFLAGS)
@@ -178,35 +216,6 @@ 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_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
-               [enable udev support]), [enable_udev=${enableval}])
-if (test "${enable_udev}" = "yes"); then
-       AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
-       PKG_CHECK_MODULES(UDEV, libudev >= 129, enable_udev=yes,
-                               AC_MSG_ERROR(udev >= 129 is required))
-       AC_CHECK_LIB(udev, udev_enumerate_add_match_property, dummy=yes,
-               AC_DEFINE(NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY, 1,
-                       [Define to 1 if you need the
-                               udev_enumerate_add_match_property() function.]))
-       AC_CHECK_LIB(udev, udev_device_get_parent_with_subsystem_devtype, dummy=yes,
-               AC_DEFINE(NEED_UDEV_DEVICE_GET_PARENT_WITH_SUBSYSTEM_DEVTYPE, 1,
-                       [Define to 1 if you need the
-                               udev_device_get_parent_with_subsystem_devtype()
-                                                                       function.]))
-       UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
-       if (test -z "${UDEV_DATADIR}"); then
-               UDEV_DATADIR="${sysconfdir}/udev/rules.d"
-       fi
-       AC_SUBST(UDEV_DATADIR)
-fi
-AC_SUBST(UDEV_CFLAGS)
-AC_SUBST(UDEV_LIBS)
-AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
-
-AC_ARG_ENABLE(ospm, AC_HELP_STRING([--enable-ospm],
-               [enable OSPM support]), [enable_ospm=${enableval}])
-AM_CONDITIONAL(OSPM, test "${enable_ospm}" = "yes")
-
 AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
                [enable PolicyKit support]), [enable_polkit=${enableval}])
 if (test "${enable_polkit}" = "yes"); then
@@ -235,6 +244,8 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
                                        [enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
+SHAVE_INIT
+
 AC_OUTPUT(Makefile gdbus/Makefile include/Makefile include/version.h
                src/Makefile src/connman.service scripts/connman
                scripts/Makefile plugins/Makefile client/Makefile