build: Update configure option handling

1 files changed, 20 insertions, 247 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d821fb203..4357c0041 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -26,257 +26,30 @@ AC_DEFUN([COMPILER_FLAGS], [
 	AC_SUBST([WARNING_CFLAGS], $with_cflags)
 ])
 
-AC_DEFUN([AC_INIT_BLUEZ], [
-	AC_PREFIX_DEFAULT(/usr/local)
-
-	if (test "${prefix}" = "NONE"); then
-		dnl no prefix and no sysconfdir, so default to /etc
-		if (test "$sysconfdir" = '${prefix}/etc'); then
-			AC_SUBST([sysconfdir], ['/etc'])
-		fi
-
-		dnl no prefix and no localstatedir, so default to /var
-		if (test "$localstatedir" = '${prefix}/var'); then
-			AC_SUBST([localstatedir], ['/var'])
-		fi
-
-		dnl no prefix and no libexecdir, so default to /lib
-		if (test "$libexecdir" = '${exec_prefix}/libexec'); then
-			AC_SUBST([libexecdir], ['/lib'])
-		fi
-
-		dnl no prefix and no mandir, so use ${prefix}/share/man as default
-		if (test "$mandir" = '${prefix}/man'); then
-			AC_SUBST([mandir], ['${prefix}/share/man'])
+AC_DEFUN([MISC_FLAGS], [
+	misc_cflags=""
+	misc_ldflags=""
+	AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
+			[disable code optimization through compiler]), [
+		if (test "${enableval}" = "no"); then
+			misc_cflags="$misc_cflags -D_FORTIFY_SOURCE=2"
 		fi
-
-		prefix="${ac_default_prefix}"
-	fi
-
-	if (test "${libdir}" = '${exec_prefix}/lib'); then
-		libdir="${prefix}/lib"
-	fi
-
-	plugindir="${libdir}/bluetooth/plugins"
-
-	if (test "$sysconfdir" = '${prefix}/etc'); then
-		configdir="${prefix}/etc/bluetooth"
-	else
-		configdir="${sysconfdir}/bluetooth"
-	fi
-
-	if (test "$localstatedir" = '${prefix}/var'); then
-		storagedir="${prefix}/var/lib/bluetooth"
-	else
-		storagedir="${localstatedir}/lib/bluetooth"
-	fi
-
-	AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
-				[Directory for the configuration files])
-	AC_DEFINE_UNQUOTED(STORAGEDIR, "${storagedir}",
-				[Directory for the storage files])
-
-	AC_SUBST(CONFIGDIR, "${configdir}")
-	AC_SUBST(STORAGEDIR, "${storagedir}")
-
-	UDEV_DIR="`$PKG_CONFIG --variable=udevdir udev`"
-	if (test -z "${UDEV_DIR}"); then
-		UDEV_DIR="/lib/udev"
-	fi
-	AC_SUBST(UDEV_DIR)
-])
-
-AC_DEFUN([AC_PATH_DBUS], [
-	PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes,
-				AC_MSG_ERROR(D-Bus >= 1.4 is required))
-	AC_SUBST(DBUS_CFLAGS)
-	AC_SUBST(DBUS_LIBS)
-])
-
-AC_DEFUN([AC_PATH_GLIB], [
-	PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes,
-				AC_MSG_ERROR(GLib >= 2.32 is required))
-	AC_SUBST(GLIB_CFLAGS)
-	AC_SUBST(GLIB_LIBS)
-])
-
-AC_DEFUN([AC_PATH_USB], [
-	PKG_CHECK_MODULES(USB, libusb, usb_found=yes, usb_found=no)
-	AC_SUBST(USB_CFLAGS)
-	AC_SUBST(USB_LIBS)
-	AC_CHECK_LIB(usb, usb_get_busses, dummy=yes,
-		AC_DEFINE(NEED_USB_GET_BUSSES, 1,
-			[Define to 1 if you need the usb_get_busses() function.]))
-	AC_CHECK_LIB(usb, usb_interrupt_read, dummy=yes,
-		AC_DEFINE(NEED_USB_INTERRUPT_READ, 1,
-			[Define to 1 if you need the usb_interrupt_read() function.]))
-])
-
-AC_DEFUN([AC_PATH_UDEV], [
-	PKG_CHECK_MODULES(UDEV, libudev, udev_found=yes, udev_found=no)
-	AC_SUBST(UDEV_CFLAGS)
-	AC_SUBST(UDEV_LIBS)
-	AC_CHECK_LIB(udev, udev_hwdb_new,
-		AC_DEFINE(HAVE_UDEV_HWDB_NEW, 1,
-			[Define to 1 if you have the udev_hwdb_new() function.]))
-])
-
-AC_DEFUN([AC_PATH_READLINE], [
-	AC_CHECK_HEADER(readline/readline.h,
-		AC_CHECK_LIB(readline, main,
-			[ readline_found=yes
-			AC_SUBST(READLINE_LIBS, "-lreadline")
-			], readline_found=no),
-		[])
-])
-
-AC_DEFUN([AC_PATH_OUI], [
-	AC_ARG_WITH(ouifile,
-		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-		    [ac_with_ouifile=$withval],
-		    [ac_with_ouifile="/var/lib/misc/oui.txt"])
-	AC_DEFINE_UNQUOTED(OUIFILE, ["$ac_with_ouifile"], [Define the OUI file path])
-])
-
-AC_DEFUN([AC_ARG_BLUEZ], [
-	debug_enable=no
-	optimization_enable=yes
-	fortify_enable=yes
-	pie_enable=yes
-	usb_enable=${usb_found}
-	audio_enable=yes
-	input_enable=yes
-	network_enable=yes
-	sap_enable=no
-	service_enable=yes
-	health_enable=no
-	tools_enable=yes
-	cups_enable=no
-	test_enable=no
-	hid2hci_enable=no
-	datafiles_enable=yes
-	sap_driver=dummy
-	dbusoob_enable=no
-	neard_enable=no
-
-	AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [
-		optimization_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
-		fortify_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(pie, AC_HELP_STRING([--disable-pie], [disable position independent executables flag]), [
-		pie_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(network, AC_HELP_STRING([--disable-network], [disable network plugin]), [
-		network_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(sap, AC_HELP_STRING([--enable-sap], [enable sap plugin]), [
-		sap_enable=${enableval}
 	])
-
-	AC_ARG_WITH(sap, AC_HELP_STRING([--with-sap=DRIVER], [select SAP driver]), [
-		sap_driver=${withval}
-	])
-	AC_SUBST([SAP_DRIVER], [sap-${sap_driver}.c])
-
-	AC_ARG_ENABLE(input, AC_HELP_STRING([--disable-input], [disable input plugin]), [
-		input_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(audio, AC_HELP_STRING([--disable-audio], [disable audio plugin]), [
-		audio_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(service, AC_HELP_STRING([--disable-service], [disable service plugin]), [
-		service_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(health, AC_HELP_STRING([--enable-health], [enable health plugin]), [
-		health_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb], [enable USB support]), [
-		usb_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [
-		tools_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(hid2hci, AC_HELP_STRING([--enable-hid2hci], [install HID mode switching utility]), [
-		hid2hci_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(cups, AC_HELP_STRING([--enable-cups], [install CUPS backend support]), [
-		cups_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [
-		test_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--enable-datafiles], [install Bluetooth configuration and data files]), [
-		datafiles_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
-		debug_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(dbusoob, AC_HELP_STRING([--enable-dbusoob], [compile with D-Bus OOB plugin]), [
-		dbusoob_enable=${enableval}
+	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
+			misc_cflags="$misc_cflags -g"
+		fi
 	])
-
-	AC_ARG_ENABLE(neard, AC_HELP_STRING([--enable-neard], [compile with neard plugin]), [
-		neard_enable=${enableval}
+	AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
+			[enable position independent executables flag]), [
+		if (test "${enableval}" = "yes" &&
+				test "${ac_cv_prog_cc_pie}" = "yes"); then
+			misc_cflags="$misc_cflags -fPIC"
+			misc_ldflags="$misc_ldflags -pie"
+		fi
 	])
-
-	misc_cflags=""
-	misc_ldflags=""
-
-	if (test "${fortify_enable}" = "yes"); then
-		misc_cflags="$misc_cflags -D_FORTIFY_SOURCE=2"
-	fi
-
-	if (test "${pie_enable}" = "yes" && test "${ac_cv_prog_cc_pie}" = "yes"); then
-		misc_cflags="$misc_cflags -fPIC"
-		misc_ldflags="$misc_ldflags -pie"
-	fi
-
-	if (test "${debug_enable}" = "yes" && test "${ac_cv_prog_cc_g}" = "yes"); then
-		misc_cflags="$misc_cflags -g"
-	fi
-
-	if (test "${optimization_enable}" = "no"); then
-		misc_cflags="$misc_cflags -O0"
-	fi
-
 	AC_SUBST([MISC_CFLAGS], $misc_cflags)
 	AC_SUBST([MISC_LDFLAGS], $misc_ldflags)
-
-	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
-		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
-	fi
-
-	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
-
-	AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
-	AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes")
-	AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
-	AM_CONDITIONAL(SAPPLUGIN, test "${sap_enable}" = "yes")
-	AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes")
-	AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes")
-	AM_CONDITIONAL(READLINE, test "${readline_found}" = "yes")
-	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
-	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
-	AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes" && test "${udev_found}" = "yes")
-	AM_CONDITIONAL(DATAFILES, test "${datafiles_enable}" = "yes")
-	AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
-	AM_CONDITIONAL(NEARDPLUGIN, test "${neard_enable}" = "yes")
 ])