configure: Fix use of obsolete macros

This fixes the following warnings when using autoconf >= 2.70:

  configure.ac:19: warning: The macro `AC_LANG_C' is obsolete.
  configure.ac:45: warning: The macro `AC_HELP_STRING' is obsolete.
  configure.ac:440: warning: AC_OUTPUT should be used without arguments.

The macros are replacing following the autoconf documentation:

https://www.gnu.org/software/autoconf/manual/autoconf-2.70/html_node/Obsolete-Macros.html

Fixes: https://github.com/bluez/bluez/issues/246
Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/acinclude.m4 b/acinclude.m4
index b388dfc..c5d6de7 100755 (executable)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -71,13 +71,13 @@ AC_DEFUN([COMPILER_FLAGS], [
 AC_DEFUN([MISC_FLAGS], [
        misc_cflags=""
        misc_ldflags=""
-       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
                        misc_cflags="$misc_cflags -O0"
                fi
        ])
-       AC_ARG_ENABLE(asan, AC_HELP_STRING([--enable-asan],
+       AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],
                        [enable linking with address sanitizer]), [
                save_LIBS=$LIBS
                AC_CHECK_LIB(asan, _init)
@@ -90,7 +90,7 @@ AC_DEFUN([MISC_FLAGS], [
                        AC_SUBST([ASAN_LIB], ${ac_cv_lib_asan__init})
                fi
        ])
-       AC_ARG_ENABLE(lsan, AC_HELP_STRING([--enable-lsan],
+       AC_ARG_ENABLE(lsan, AS_HELP_STRING([--enable-lsan],
                        [enable linking with address sanitizer]), [
                save_LIBS=$LIBS
                AC_CHECK_LIB(lsan, _init)
@@ -103,7 +103,7 @@ AC_DEFUN([MISC_FLAGS], [
                        AC_SUBST([ASAN_LIB], ${ac_cv_lib_lsan__init})
                fi
        ])
-       AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
+       AC_ARG_ENABLE(ubsan, AS_HELP_STRING([--enable-ubsan],
                        [enable linking with address sanitizer]), [
                save_LIBS=$LIBS
                AC_CHECK_LIB(ubsan, _init)
@@ -115,14 +115,14 @@ AC_DEFUN([MISC_FLAGS], [
                        misc_ldflags="$misc_ldflags -fsanitize=undefined";
                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
                        misc_cflags="$misc_cflags -g"
                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

diff --git a/configure.ac b/configure.ac
index 76af42a..9c754d0 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
 
 COMPILER_FLAGS
 
-AC_LANG_C
+AC_LANG([C])
 
 AC_C_RESTRICT
 
@@ -50,7 +50,7 @@ MISC_FLAGS
 AM_CONDITIONAL(VALGRIND, test "${enable_valgrind}" = "yes" &&
                test "$ASAN_LIB" != "yes" && test "LSAN_LIB" != "yes")
 
-AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
+AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads],
                [enable threading support]), [enable_threads=${enableval}])
 
 AC_CHECK_FUNCS(explicit_bzero)
@@ -97,7 +97,7 @@ PKG_CHECK_MODULES(INIPARSER, iniparser)
 AC_SUBST(INIPARSER_CFLAGS)
 AC_SUBST(INIPARSER_LIBS)
 
-AC_ARG_WITH([dbusconfdir], AC_HELP_STRING([--with-dbusconfdir=DIR],
+AC_ARG_WITH([dbusconfdir], AS_HELP_STRING([--with-dbusconfdir=DIR],
                                [path to D-Bus configuration directory]),
                                        [path_dbusconfdir=${withval}])
 if (test -z "${path_dbusconfdir}"); then
@@ -110,7 +110,7 @@ if (test -z "${path_dbusconfdir}"); then
 fi
 AC_SUBST(DBUS_CONFDIR, [${path_dbusconfdir}])
 
-AC_ARG_WITH([dbussystembusdir], AC_HELP_STRING([--with-dbussystembusdir=DIR],
+AC_ARG_WITH([dbussystembusdir], AS_HELP_STRING([--with-dbussystembusdir=DIR],
                                [path to D-Bus system bus services directory]),
                                        [path_dbussystembusdir=${withval}])
 if (test -z "${path_dbussystembusdir}"); then
@@ -123,7 +123,7 @@ if (test -z "${path_dbussystembusdir}"); then
 fi
 AC_SUBST(DBUS_SYSTEMBUSDIR, [${path_dbussystembusdir}])
 
-AC_ARG_WITH([dbussessionbusdir], AC_HELP_STRING([--with-dbussessionbusdir=DIR],
+AC_ARG_WITH([dbussessionbusdir], AS_HELP_STRING([--with-dbussessionbusdir=DIR],
                                [path to D-Bus session bus services directory]),
                                        [path_dbussessionbusdir=${withval}])
 if (test -z "${path_dbussessionbusdir}"); then
@@ -136,7 +136,7 @@ if (test -z "${path_dbussessionbusdir}"); then
 fi
 AC_SUBST(DBUS_SESSIONBUSDIR, [${path_dbussessionbusdir}])
 
-AC_ARG_ENABLE(backtrace, AC_HELP_STRING([--enable-backtrace],
+AC_ARG_ENABLE(backtrace, AS_HELP_STRING([--enable-backtrace],
                [compile backtrace support]), [enable_backtrace=${enableval}])
 
 if (test "${enable_backtrace}" = "yes"); then
@@ -150,27 +150,27 @@ if (test "${enable_backtrace}" = "yes"); then
        AC_SUBST(BACKTRACE_LIBS)
 fi
 
-AC_ARG_ENABLE(library, AC_HELP_STRING([--enable-library],
+AC_ARG_ENABLE(library, AS_HELP_STRING([--enable-library],
                [install Bluetooth library]), [enable_library=${enableval}])
 AM_CONDITIONAL(LIBRARY, test "${enable_library}" = "yes")
 
-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(nfc, AC_HELP_STRING([--enable-nfc],
+AC_ARG_ENABLE(nfc, AS_HELP_STRING([--enable-nfc],
                [enable TIZEN_NFC_PLUGIN paring]), [enable_nfc=${enableval}])
 AM_CONDITIONAL(TIZEN_NFC_PLUGIN, test "${enable_nfc}" = "yes")
 
-AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
+AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
                [disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
-AC_ARG_ENABLE(monitor, AC_HELP_STRING([--disable-monitor],
+AC_ARG_ENABLE(monitor, AS_HELP_STRING([--disable-monitor],
                [disable Bluetooth monitor]), [enable_monitor=${enableval}])
 AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")
 
-AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev],
+AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev],
                [disable udev device support]), [enable_udev=${enableval}])
 if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then
        PKG_CHECK_MODULES(UDEV, libudev >= 172, dummy=yes,
@@ -183,7 +183,7 @@ if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then
 fi
 AM_CONDITIONAL(UDEV, test "${enable_udev}" != "no")
 
-AC_ARG_WITH([udevdir], AC_HELP_STRING([--with-udevdir=DIR],
+AC_ARG_WITH([udevdir], AS_HELP_STRING([--with-udevdir=DIR],
                        [path to udev directory]), [path_udevdir=${withval}])
 if (test "${enable_udev}" != "no" && test -z "${path_udevdir}"); then
        AC_MSG_CHECKING([udev directory])
@@ -195,11 +195,11 @@ if (test "${enable_udev}" != "no" && test -z "${path_udevdir}"); then
 fi
 AC_SUBST(UDEV_DIR, [${path_udevdir}])
 
-AC_ARG_ENABLE(cups, AC_HELP_STRING([--disable-cups],
+AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups],
                 [disable CUPS printer support]), [enable_cups=${enableval}])
 AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
 
-AC_ARG_ENABLE(mesh, AC_HELP_STRING([--enable-mesh],
+AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
                [enable Mesh profile support]), [enable_mesh=${enableval}])
 AM_CONDITIONAL(MESH, test "${enable_mesh}" = "yes")
 
@@ -210,7 +210,7 @@ if (test "${enable_mesh}" == "yes"); then
        AC_SUBST(JSON_LIBS)
 fi
 
-AC_ARG_ENABLE(midi, AC_HELP_STRING([--enable-midi],
+AC_ARG_ENABLE(midi, AS_HELP_STRING([--enable-midi],
                 [enable MIDI support]), [enable_midi=${enableval}])
 AM_CONDITIONAL(MIDI, test "${enable_midi}" = "yes")
 
@@ -222,7 +222,7 @@ if (test "${enable_midi}" = "yes"); then
 fi
 
 
-AC_ARG_ENABLE(obex, AC_HELP_STRING([--disable-obex],
+AC_ARG_ENABLE(obex, AS_HELP_STRING([--disable-obex],
                 [disable OBEX profile support]), [enable_obex=${enableval}])
 
 AC_SUBST(ICAL_CFLAGS)
@@ -230,11 +230,11 @@ AC_SUBST(ICAL_LIBS)
 
 AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")
 
-AC_ARG_ENABLE(btpclient, AC_HELP_STRING([--enable-btpclient],
+AC_ARG_ENABLE(btpclient, AS_HELP_STRING([--enable-btpclient],
                 [enable BTP client]), [enable_btpclient=${enableval}])
 AM_CONDITIONAL(BTPCLIENT, test "${enable_btpclient}" = "yes")
 
-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
@@ -249,7 +249,7 @@ AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" ||
 AM_CONDITIONAL(LIBSHARED_ELL, test "${enable_btpclient}" = "yes" ||
                                                 test "${enable_mesh}" = "yes")
 
-AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
+AC_ARG_ENABLE(client, AS_HELP_STRING([--disable-client],
                [disable command line client]), [enable_client=${enableval}])
 AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
 
@@ -259,12 +259,12 @@ if (test "${enable_client}" != "no" || test "${enable_mesh}" == "yes"); then
 fi
 AM_CONDITIONAL(READLINE, test "${enable_readline}" = "yes")
 
-AC_ARG_ENABLE(systemd, AC_HELP_STRING([--disable-systemd],
+AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd],
                [disable systemd integration]), [enable_systemd=${enableval}])
 AM_CONDITIONAL(SYSTEMD, test "${enable_systemd}" != "no")
 
 AC_ARG_WITH([systemdsystemunitdir],
-                       AC_HELP_STRING([--with-systemdsystemunitdir=DIR],
+                       AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
                        [path to systemd system unit directory]),
                                        [path_systemunitdir=${withval}])
 if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then
@@ -278,7 +278,7 @@ fi
 AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}])
 
 AC_ARG_WITH([systemduserunitdir],
-                       AC_HELP_STRING([--with-systemduserunitdir=DIR],
+                       AS_HELP_STRING([--with-systemduserunitdir=DIR],
                        [path to systemd user unit directory]),
                                        [path_userunitdir=${withval}])
 if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
@@ -291,12 +291,12 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
 fi
 AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}])
 
-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")
 
-AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages],
+AC_ARG_ENABLE(manpages, AS_HELP_STRING([--enable-manpages],
                        [enable building of manual pages]),
                                        [enable_manpages=${enableval}])
 if (test "${enable_manpages}" != "no"); then
@@ -305,95 +305,95 @@ fi
 AM_CONDITIONAL(MANPAGES, test "${enable_manpages}" = "yes")
 AM_CONDITIONAL(RUN_RST2MAN, test "${enable_manpages}" = "yes" && test "${RST2MAN}" != "no")
 
-AC_ARG_ENABLE(testing, AC_HELP_STRING([--enable-testing],
+AC_ARG_ENABLE(testing, AS_HELP_STRING([--enable-testing],
                        [enable testing tools]),
                                        [enable_testing=${enableval}])
 AM_CONDITIONAL(TESTING, test "${enable_testing}" = "yes")
 
-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
+AC_ARG_ENABLE(experimental, AS_HELP_STRING([--enable-experimental],
                        [enable experimental tools]),
                                        [enable_experimental=${enableval}])
 AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" = "yes")
 
 # Start of TIZEN_FEATURE_BLUEZ_MODIFY
-AC_ARG_ENABLE(wearable, AC_HELP_STRING([--enable-wearable],
+AC_ARG_ENABLE(wearable, AS_HELP_STRING([--enable-wearable],
                        [enable wearable profile]), [enable_wearable=${enableval}])
 AM_CONDITIONAL(WEARABLE, test "${enable_wearable}" = "yes")
 
-AC_ARG_ENABLE(autopair, AC_HELP_STRING([--enable-autopair],
+AC_ARG_ENABLE(autopair, AS_HELP_STRING([--enable-autopair],
                        [Enable Autopair Plugin]), [enable_autopair=${enableval}])
 AM_CONDITIONAL(AUTOPAIR, test "${enable_autopair}" = "yes")
 
-AC_ARG_ENABLE(hid, AC_HELP_STRING([--disable-hid],
+AC_ARG_ENABLE(hid, AS_HELP_STRING([--disable-hid],
                        [disable HID Plugin]), [enable_hid=${enableval}])
 AM_CONDITIONAL(TIZEN_HID_PLUGIN, test "${enable_hid}" != "no")
 
-AC_ARG_ENABLE(health, AC_HELP_STRING([--enable-health],
+AC_ARG_ENABLE(health, AS_HELP_STRING([--enable-health],
                [enable HEALTH profiles]), [enable_health=${enableval}])
 AM_CONDITIONAL(TIZEN_HEALTH_PLUGIN, test "${enable_health}" = "yes")
 
-AC_ARG_ENABLE(proximity, AC_HELP_STRING([--enable-proximity],
+AC_ARG_ENABLE(proximity, AS_HELP_STRING([--enable-proximity],
                   [Enable PROXIMITY Plugin]), [enable_proximity=${enableval}])
 AM_CONDITIONAL(TIZEN_PROXIMITY_PLUGIN, test "${enable_proximity}" = "yes")
 
-AC_ARG_ENABLE(tds, AC_HELP_STRING([--enable-tds],
+AC_ARG_ENABLE(tds, AS_HELP_STRING([--enable-tds],
                   [Enable TDS Plugin]), [enable_tds=${enableval}])
 AM_CONDITIONAL(TIZEN_TDS_PLUGIN, test "${enable_tds}" = "yes")
 
-AC_ARG_ENABLE(tizenunusedplugin, AC_HELP_STRING([--enable-tizenunusedplugin],
+AC_ARG_ENABLE(tizenunusedplugin, AS_HELP_STRING([--enable-tizenunusedplugin],
                 [Enable Unused Plugin]), [enable_tizenunusedplugin=${enableval}])
 AM_CONDITIONAL(TIZEN_UNUSED_PLUGIN, test "${enable_tizenunusedplugin}" = "yes")
 
-AC_ARG_ENABLE(sap, AC_HELP_STRING([--enable-sap],
+AC_ARG_ENABLE(sap, AS_HELP_STRING([--enable-sap],
                        [Enable SAP Plugin]), [enable_sap=${enableval}])
 AM_CONDITIONAL(TIZEN_SAP_PLUGIN, test "${enable_sap}" = "yes")
 
-AC_ARG_ENABLE(a2dp, AC_HELP_STRING([--disable-a2dp],
+AC_ARG_ENABLE(a2dp, AS_HELP_STRING([--disable-a2dp],
                [disable A2DP profile]), [enable_a2dp=${enableval}])
 AM_CONDITIONAL(TIZEN_A2DP_PLUGIN, test "${enable_a2dp}" != "no")
 
-AC_ARG_ENABLE(avrcp, AC_HELP_STRING([--disable-avrcp],
+AC_ARG_ENABLE(avrcp, AS_HELP_STRING([--disable-avrcp],
                [disable AVRCP profile]), [enable_avrcp=${enableval}])
 AM_CONDITIONAL(TIZEN_AVRCP_PLUGIN, test "${enable_avrcp}" != "no")
 
-AC_ARG_ENABLE(network, AC_HELP_STRING([--disable-network],
+AC_ARG_ENABLE(network, AS--disable-hid_HELP_STRING([--disable-network],
                [disable NETWORK profile]), [enable_network=${enableval}])
 AM_CONDITIONAL(TIZEN_NETWORK_PLUGIN, test "${enable_network}" != "no")
 
-AC_ARG_ENABLE(bredr, AC_HELP_STRING([--enable-bredr],
+AC_ARG_ENABLE(bredr, AS_HELP_STRING([--enable-bredr],
                        [Enable BREDR Plugin]), [enable_bredr=${enableval}])
 AM_CONDITIONAL(TIZEN_BREDR_PLUGIN, test "${enable_bredr}" = "yes")
 
-AC_ARG_ENABLE(le, AC_HELP_STRING([--enable-le],
+AC_ARG_ENABLE(le, AS_HELP_STRING([--enable-le],
                        [Enable LE Plugin]), [enable_le=${enableval}])
 AM_CONDITIONAL(TIZEN_LE_PLUGIN, test "${enable_le}" = "yes")
 
-AC_ARG_ENABLE(crypto-tests, AC_HELP_STRING([--disable-crypto-tests],
+AC_ARG_ENABLE(crypto-tests, AS_HELP_STRING([--disable-crypto-tests],
                [Disable CRYPTO testcases]), [enable_crypto_tests=${enableval}])
 AM_CONDITIONAL(TIZEN_CRYPTO_TESTS, test "${enable_crypto_tests}" != "no")
 
 # End of TIZEN_FEATURE_BLUEZ_MODIFY
 
-AC_ARG_ENABLE(deprecated, AC_HELP_STRING([--enable-deprecated],
+AC_ARG_ENABLE(deprecated, AS_HELP_STRING([--enable-deprecated],
                        [enable deprecated tools]),
                                        [enable_deprecated=${enableval}])
 AM_CONDITIONAL(DEPRECATED, test "${enable_deprecated}" = "yes")
 
-AC_ARG_ENABLE(sixaxis, AC_HELP_STRING([--enable-sixaxis],
+AC_ARG_ENABLE(sixaxis, AS_HELP_STRING([--enable-sixaxis],
                [enable sixaxis plugin]), [enable_sixaxis=${enableval}])
 AM_CONDITIONAL(SIXAXIS, test "${enable_sixaxis}" = "yes" &&
                                         test "${enable_udev}" != "no")
 
-AC_ARG_ENABLE(hid2hci, AC_HELP_STRING([--enable-hid2hci],
+AC_ARG_ENABLE(hid2hci, AS_HELP_STRING([--enable-hid2hci],
                [enable hid2hci tool]), [enable_hid2hci=${enableval}])
 AM_CONDITIONAL(HID2HCI, test "${enable_hid2hci}" = "yes" &&
                                        test "${enable_udev}" != "no")
 
-AC_ARG_ENABLE(logger, AC_HELP_STRING([--enable-logger],
+AC_ARG_ENABLE(logger, AS_HELP_STRING([--enable-logger],
                [enable HCI logger service]), [enable_logger=${enableval}])
 AM_CONDITIONAL(LOGGER, test "${enable_logger}" = "yes")
 
-AC_ARG_ENABLE(admin, AC_HELP_STRING([--enable-admin],
+AC_ARG_ENABLE(admin, AS_HELP_STRING([--enable-admin],
                [enable admin policy plugin]), [enable_admin=${enableval}])
 AM_CONDITIONAL(ADMIN, test "${enable_admin}" = "yes")
 
@@ -428,7 +428,7 @@ AC_DEFINE_UNQUOTED(MESH_STORAGEDIR, "${storagedir}/mesh",
                        [Directory for the mesh daemon storage files])
 AC_SUBST(MESH_STORAGEDIR, "${storagedir}/mesh")
 
-AC_ARG_ENABLE(android, AC_HELP_STRING([--enable-android],
+AC_ARG_ENABLE(android, AS_HELP_STRING([--enable-android],
                        [enable BlueZ for Android]),
                                        [enable_android=${enableval}])
 AM_CONDITIONAL(ANDROID, test "${enable_android}" = "yes")
@@ -450,4 +450,5 @@ fi
 AC_DEFINE_UNQUOTED(ANDROID_STORAGEDIR, "${storagedir}/android",
                        [Directory for the Android daemon storage files])
 
-AC_OUTPUT(Makefile src/bluetoothd.rst lib/bluez.pc mesh/bluetooth-meshd.rst)
+AC_CONFIG_FILES(Makefile src/bluetoothd.rst lib/bluez.pc mesh/bluetooth-meshd.rst)
+AC_OUTPUT