X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=7bbd8b2a53c7e32833a7cbe82affc42d9d71415b;hb=94e55b75eec47c62f46deb7141c658f36c04a0b2;hp=6b8baa11a076f57a2df380a0ff5ca05174fdd08c;hpb=93dd1f9b16cc364c2aad3a8c2979c4c7d9f5bd31;p=platform%2Fupstream%2Fconnman.git

diff --git a/configure.ac b/configure.ac
index 6b8baa1..7bbd8b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.22)
+AM_INIT_AUTOMAKE(connman, 0.37)
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -30,13 +30,20 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
+AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
+			[disable code optimization through compiler]), [
+	if (test "${enableval}" = "no"); then
+		CFLAGS="$CFLAGS -O0"
+	fi
+])
+
 GTK_DOC_CHECK
 
 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"
 	fi
 ])
 
@@ -197,25 +204,6 @@ AC_CHECK_LIB(c, inotify_init, dummy=yes,
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
 			AC_MSG_ERROR(dynamic linking loader is required))
 
-PKG_CHECK_MODULES(UDEV, libudev >= 141,
-				[enable_udev="yes"], [enable_udev="no"])
-if (test "${enable_udev}" = "yes"); then
-	AC_CHECK_LIB(udev, udev_monitor_filter_update, dummy=yes,
-		AC_DEFINE(NEED_UDEV_MONITOR_FILTER, 1,
-			[Define to 1 if you need the
-					udev_monitor_filter...() functions.]))
-	UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
-	if (test -z "${UDEV_DATADIR}"); then
-		UDEV_DATADIR="${sysconfdir}/udev/rules.d"
-	else
-		UDEV_DATADIR="${UDEV_DATADIR}/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_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH],
 						[path to Intel WiMAX SDK]),
 				[pkgconfig_iwmxsdk=${withval}/lib/pkgconfig])
@@ -306,6 +294,30 @@ 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(udev, AC_HELP_STRING([--disable-udev],
+			[don't use udev support even if available]),
+						[enable_udev=${enableval}])
+if (test "${enable_udev}" != "no"); then
+	PKG_CHECK_MODULES(UDEV, libudev >= 141,
+				[enable_udev="yes"], [enable_udev="no"])
+fi
+if (test "${enable_udev}" = "yes"); then
+	AC_CHECK_LIB(udev, udev_monitor_filter_update, dummy=yes,
+		AC_DEFINE(NEED_UDEV_MONITOR_FILTER, 1,
+			[Define to 1 if you need the
+					udev_monitor_filter...() functions.]))
+	UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
+	if (test -z "${UDEV_DATADIR}"); then
+		UDEV_DATADIR="${sysconfdir}/udev/rules.d"
+	else
+		UDEV_DATADIR="${UDEV_DATADIR}/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(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[don't install configuration and data files]),
 					[enable_datafiles=${enableval}])