configure: Update to support Autoconf >= 2.69

1 files changed, 30 insertions, 28 deletions

diff --git a/configure.ac b/configure.ac
index 850b507d..ebaa29ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ(2.60)
-AC_INIT(ofono, 1.34)
+AC_PREREQ([2.69])
+AC_INIT([ofono], [1.34])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -14,7 +14,7 @@ PKG_PROG_PKG_CONFIG
 
 COMPILER_FLAGS
 
-AC_LANG_C
+AC_LANG([C])
 
 AC_C_RESTRICT
 
@@ -30,14 +30,14 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 AC_DISABLE_STATIC
 LT_INIT
 
-AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
+AC_ARG_ENABLE(optimization, AS_HELP_STRING([--disable-optimization],
 			[disable code optimization through compiler]), [
 	if (test "${enableval}" = "no"); then
 		CFLAGS="$CFLAGS -O0"
 	fi
 ])
 
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
 			[enable compiling with debugging information]), [
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_g}" = "yes"); then
@@ -45,7 +45,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 	fi
 ])
 
-AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
+AC_ARG_ENABLE(pie, AS_HELP_STRING([--enable-pie],
 			[enable position independent executables flag]), [
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_pie}" = "yes"); then
@@ -78,7 +78,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.6, dummy=yes,
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH],
+AC_ARG_WITH(dbusconfdir, AS_HELP_STRING([--with-dbusconfdir=PATH],
 	[path to D-Bus config directory]), [path_dbusconf=${withval}],
 		[path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"])
 if (test -z "${path_dbusconf}"); then
@@ -88,7 +88,7 @@ else
 fi
 AC_SUBST(DBUS_CONFDIR)
 
-AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH],
+AC_ARG_WITH(dbusdatadir, AS_HELP_STRING([--with-dbusdatadir=PATH],
 	[path to D-Bus data directory]), [path_dbusdata=${withval}],
 		[path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"])
 if (test -z "${path_dbusdata}"); then
@@ -98,7 +98,7 @@ else
 fi
 AC_SUBST(DBUS_DATADIR)
 
-AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+AC_ARG_WITH([systemdunitdir], AS_HELP_STRING([--with-systemdunitdir=DIR],
 	[path to systemd service directory]), [path_systemdunit=${withval}],
 		[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
 if (test -n "${path_systemdunit}"); then
@@ -107,19 +107,19 @@ if (test -n "${path_systemdunit}"); then
 fi
 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
-AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
+AC_ARG_ENABLE(test, AS_HELP_STRING([--enable-test],
 		[enable test/example scripts]), [enable_test=${enableval}])
 AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
 
-AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
+AC_ARG_ENABLE(tools, AS_HELP_STRING([--enable-tools],
 		[enable testing tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
 
-AC_ARG_ENABLE(dundee, AC_HELP_STRING([--enable-dundee],
+AC_ARG_ENABLE(dundee, AS_HELP_STRING([--enable-dundee],
 		[enable dialup deamon support]), [enable_dundee=${enableval}])
 AM_CONDITIONAL(DUNDEE, test "${enable_dundee}" = "yes")
 
-AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev],
+AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev],
 			[disable udev modem detection support]),
 						[enable_udev=${enableval}])
 if (test "${enable_udev}" != "no"); then
@@ -137,47 +137,47 @@ AC_SUBST(UDEV_CFLAGS)
 AC_SUBST(UDEV_LIBS)
 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
 
-AC_ARG_ENABLE(atmodem, AC_HELP_STRING([--disable-atmodem],
+AC_ARG_ENABLE(atmodem, AS_HELP_STRING([--disable-atmodem],
 				[disable ETSI AT modem support]),
 					[enable_atmodem=${enableval}])
 AM_CONDITIONAL(ATMODEM, test "${enable_atmodem}" != "no")
 
-AC_ARG_ENABLE(cdmamodem, AC_HELP_STRING([--disable-cdmamodem],
+AC_ARG_ENABLE(cdmamodem, AS_HELP_STRING([--disable-cdmamodem],
 				[disable CDMA AT modem support]),
 					[enable_cdmamodem=${enableval}])
 AM_CONDITIONAL(CDMAMODEM, test "${enable_cdmamodem}" != "no")
 
-AC_ARG_ENABLE(phonesim, AC_HELP_STRING([--disable-phonesim],
+AC_ARG_ENABLE(phonesim, AS_HELP_STRING([--disable-phonesim],
 				[disable Phone simulator support]),
 					[enable_phonesim=${enableval}])
 AM_CONDITIONAL(PHONESIM, test "${enable_phonesim}" != "no" &&
 					test "${enable_atmodem}" != "no")
 
-AC_ARG_ENABLE(isimodem, AC_HELP_STRING([--disable-isimodem],
+AC_ARG_ENABLE(isimodem, AS_HELP_STRING([--disable-isimodem],
 				[disable PhoNet/ISI modem support]),
 					[enable_isimodem=${enableval}])
 AM_CONDITIONAL(ISIMODEM, test "${enable_isimodem}" != "no")
 
-AC_ARG_ENABLE(rilmodem, AC_HELP_STRING([--disable-rilmodem],
+AC_ARG_ENABLE(rilmodem, AS_HELP_STRING([--disable-rilmodem],
 				[disable RIL modem support]),
 					[enable_rilmodem=${enableval}])
 AM_CONDITIONAL(RILMODEM, test "${enable_rilmodem}" != "no")
 
-AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem],
+AC_ARG_ENABLE(qmimodem, AS_HELP_STRING([--disable-qmimodem],
 				[disable Qualcomm QMI modem support]),
 					[enable_qmimodem=${enableval}])
 AM_CONDITIONAL(QMIMODEM, test "${enable_qmimodem}" != "no")
 
-AC_ARG_ENABLE(mbimmodem, AC_HELP_STRING([--disable-mbimmodem],
+AC_ARG_ENABLE(mbimmodem, AS_HELP_STRING([--disable-mbimmodem],
 				[disable MBIM modem support]),
 					[enable_mbimmodem=${enableval}])
 AM_CONDITIONAL(MBIMMODEM, test "${enable_mbimmodem}" != "no")
 
-AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
+AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],
 				[disable BlueZ 4 and BlueZ 5 plugins support]),
 					[enable_bluetooth=${enableval}])
 
-AC_ARG_ENABLE(bluez4, AC_HELP_STRING([--enable-bluez4],
+AC_ARG_ENABLE(bluez4, AS_HELP_STRING([--enable-bluez4],
 				[enable BlueZ 4 plugins support prior to BlueZ 5]),
 					[enable_bluez4=${enableval}])
 
@@ -191,10 +191,10 @@ fi
 AM_CONDITIONAL(BLUEZ4, test "${enable_bluetooth}" != "no" && test "${enable_bluez4}" = "yes")
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 
-AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE],
+AC_ARG_WITH([provisiondb], AS_HELP_STRING([--with-provisiondb=FILE],
 	[location of provision database]), [path_provisiondb=${withval}])
 
-AC_ARG_ENABLE(provision, AC_HELP_STRING([--disable-provision],
+AC_ARG_ENABLE(provision, AS_HELP_STRING([--disable-provision],
 				[disable provisioning support]),
 					[enable_provision=${enableval}])
 if (test "${enable_provision}" != "no"); then
@@ -215,12 +215,12 @@ if (test "${enable_provision}" != "no"); then
 fi
 AM_CONDITIONAL(PROVISION, test "${enable_provision}" != "no")
 
-AC_ARG_ENABLE(upower, AC_HELP_STRING([--disable-upower],
+AC_ARG_ENABLE(upower, AS_HELP_STRING([--disable-upower],
 			[disable UPower plugin]),
 					[enable_upower=${enableval}])
 AM_CONDITIONAL(UPOWER, test "${enable_power}" != "no")
 
-AC_ARG_ENABLE([external_ell], AC_HELP_STRING([--enable-external-ell],
+AC_ARG_ENABLE([external_ell], AS_HELP_STRING([--enable-external-ell],
 				[enable external Embedded Linux library]),
 					[enable_external_ell=${enableval}])
 if (test "${enable_external_ell}" = "yes"); then
@@ -231,7 +231,7 @@ if (test "${enable_external_ell}" = "yes"); then
 fi
 AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes")
 
-AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
+AC_ARG_ENABLE(datafiles, AS_HELP_STRING([--disable-datafiles],
 			[do not install configuration and data files]),
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
@@ -261,5 +261,7 @@ fi
 AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
 			[Directory for the configuration files])
 
-AC_OUTPUT(Makefile include/version.h src/ofono.service ofono.pc \
+AC_CONFIG_FILES(Makefile include/version.h src/ofono.service ofono.pc \
 		dundee/dundee.service)
+
+AC_OUTPUT