X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=6c915e3d0ad6fb4ce2d5b53460cb13f228f48c8d;hb=5e1faea29b80b0278efe1056b598a835f8e23146;hp=1d8fc5edbc6b3e2b44f8b448c8443938adbb613b;hpb=cecbeca745ed26cd6742dc897135c28778008ef6;p=connman

diff --git a/configure.ac b/configure.ac
index 1d8fc5e..6c915e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.7)
+AM_INIT_AUTOMAKE(connman, 0.11)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -92,7 +92,7 @@ if (test "${enable_dhclient}" = "yes"); then
 	if (test -z "${path_dhclient}"); then
 		AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin)
 	else
-		UDHCPC="${path_dhclient}"
+		DHCLIENT="${path_dhclient}"
 		AC_SUBST(DHCLIENT)
 	fi
 fi
@@ -107,7 +107,7 @@ if (test "${enable_resolvconf}" = "yes"); then
 	if (test -z "${path_resolvconf}"); then
 		AC_PATH_PROG(RESOLVCONF, [resolvconf], [], $PATH:/sbin:/usr/sbin)
 	else
-		UDHCPC="${path_resolvconf}"
+		RESOLVCONF="${path_resolvconf}"
 		AC_SUBST(RESOLVCONF)
 	fi
 fi
@@ -150,23 +150,30 @@ AM_CONDITIONAL(PPPD, test "${enable_ppp}" = "yes")
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
 			AC_MSG_ERROR(dynamic linking loader is required))
 
-PKG_CHECK_MODULES(GLIB, glib-2.0, dummy=yes,
-				AC_MSG_ERROR(glib is required))
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
+				AC_MSG_ERROR(GLib >= 2.16 is required))
 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, dummy=yes,
-				AC_MSG_ERROR(gthread 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(DBUS, dbus-1 >= 1.0, dummy=yes,
-				AC_MSG_ERROR(libdbus is required))
+				AC_MSG_ERROR(D-Bus >= 1.0 is required))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
+DBUS_DATADIR="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
+if (test -z "{DBUS_DATADIR}"); then
+	DBUS_DATADIR="${sysconfdir}/dbus-1/system.d"
+else
+	DBUS_DATADIR="$DBUS_DATADIR/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)'])
@@ -186,11 +193,20 @@ if (test "${enable_udev}" = "yes"); then
 			[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
@@ -198,6 +214,11 @@ if (test "${enable_polkit}" = "yes"); then
 				AC_MSG_ERROR(PolicyKit >= 0.7 is required))
 	AC_SUBST(POLKIT_CFLAGS)
 	AC_SUBST(POLKIT_LIBS)
+	POLKIT_DATADIR="`$PKG_CONFIG --variable=policydir polkit`"
+	if (test -z "${POLKIT_DATADIR}"); then
+		POLKIT_DATADIR="${datadir}/PolicyKit/policy"
+	fi
+	AC_SUBST(POLKIT_DATADIR)
 fi
 AM_CONDITIONAL(POLKIT, test "${enable_polkit}" = "yes")
 
@@ -209,6 +230,11 @@ AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake],
 		[enable fake device support]), [enable_fake=${enableval}])
 AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes")
 
+AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
+			[don't install configuration and data files]),
+					[enable_datafiles=${enableval}])
+AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
+
 AC_OUTPUT(Makefile gdbus/Makefile include/Makefile include/version.h
 		src/Makefile src/connman.service scripts/connman
 		scripts/Makefile plugins/Makefile client/Makefile