X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=15acdbcb114241a1e4f1d26a8f3c113d04952c30;hb=e524dd47092369054fed1990ffb317f8b0b59a86;hp=c3e4f7f1c529d6a4ed87e89f2e041b685b8d6017;hpb=f085a666cb8dbaa8aa81d5eeec50cece0009cfa6;p=connman

diff --git a/configure.ac b/configure.ac
index c3e4f7f..15acdbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-AC_PREREQ(2.50)
+AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.0)
+AM_INIT_AUTOMAKE(connman, 0.5)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 			[enable compiling with debugging information]), [
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_g}" = "yes"); then
-		CFLAGS="$CFLAGS -g -O0"
+		CFLAGS="$CFLAGS -g -O0 -Werror"
 	fi
 ])
 
@@ -45,7 +45,9 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 	fi
 ])
 
+AC_PATH_PROG(UDHCPC, [udhcpc], ,$PATH:/sbin:/usr/sbin)
 AC_PATH_PROG(DHCLIENT, [dhclient], ,$PATH:/sbin:/usr/sbin)
+AC_PATH_PROG(RESOLVCONF, [resolvconf], ,$PATH:/sbin:/usr/sbin)
 AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], ,$PATH:/sbin:/usr/sbin)
 
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
@@ -56,10 +58,15 @@ PKG_CHECK_MODULES(GLIB, glib-2.0, dummy=yes,
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0, dummy=yes,
+AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
+					[enable threading support]), [
+	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))
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
+	GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
+	GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
+])
 
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
 				AC_MSG_ERROR(libdbus is required))
@@ -69,15 +76,24 @@ AC_SUBST(DBUS_LIBS)
 AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
 
+PKG_CHECK_MODULES(UDEV, libudev >= 127, udev_found=yes, udev_found=no)
+AC_SUBST(UDEV_CFLAGS)
+AC_SUBST(UDEV_LIBS)
+AM_CONDITIONAL(UDEV, test "${udev_found}" = "yes")
+
 PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, polkit_found=yes, polkit_found=no)
 AC_SUBST(POLKIT_CFLAGS)
 AC_SUBST(POLKIT_LIBS)
 AM_CONDITIONAL(POLKIT, test "${polkit_found}" = "yes")
 
+AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client],
+		[enable command line client]), [enable_client=${enableval}])
+AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes")
+
 AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake],
 			[enable fake plugin]), [enable_fake=${enableval}])
 AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes")
 
 AC_OUTPUT(Makefile gdbus/Makefile include/Makefile src/Makefile doc/Makefile
-		test/Makefile plugins/Makefile scripts/Makefile scripts/connman
-				src/connman.service doc/version.xml connman.pc)
+		test/Makefile plugins/Makefile client/Makefile scripts/Makefile
+		scripts/connman src/connman.service doc/version.xml connman.pc)