make: tweak some autofoo according to Flameeyes' recommendations for libabc

4 files changed, 41 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index a67e2f34fa..340b2e1ce4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ libudev_libudev_la_SOURCES =\
 	libudev/libudev-queue.c
 
 libudev_libudev_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \
diff --git a/autogen.sh b/autogen.sh
index f659fca525..b6ffee7297 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,5 +31,4 @@ args="--prefix=/usr \
 --with-selinux \
 --enable-gtk-doc"
 
-export CFLAGS="$CFLAGS $MYCFLAGS"
-./configure $args $@
+./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@
diff --git a/configure.ac b/configure.ac
index d155709b52..511d3b8e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_SUBST([rootlib_execdir], [$with_rootlibdir])
 AC_ARG_WITH([selinux],
 	AS_HELP_STRING([--with-selinux], [enable SELinux support]),
 	[], [with_selinux=no])
-if test "x$with_selinux" = xyes; then
+AS_IF([test "x$with_selinux" = "xyes"], [
 	LIBS_save=$LIBS
 	AC_CHECK_LIB(selinux, getprevcon,
 		[],
@@ -35,23 +35,19 @@ if test "x$with_selinux" = xyes; then
 	LIBS=$LIBS_save
 	SELINUX_LIBS="-lselinux -lsepol"
 	AC_DEFINE(WITH_SELINUX, [1] ,[SELinux support.])
-fi
+])
 AC_SUBST([SELINUX_LIBS])
-AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes])
+AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = "xyes"])
 
 AC_ARG_ENABLE([debug],
-	AS_HELP_STRING([--enable-debug], [enable debug messages]),
+	AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
 	[], [enable_debug=no])
-if test "x$enable_debug" = "xyes"; then
-	AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
-fi
+AS_IF([test "x$enable_debug" = "xyes"], [ AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.]) ])
 
 AC_ARG_ENABLE([logging],
-	AS_HELP_STRING([--disable-logging], [disable system logging]),
+	AS_HELP_STRING([--disable-logging], [disable system logging @<:@default=enabled@:>@]),
 	[], enable_logging=yes)
-if test "x$enable_logging" = "xyes"; then
-	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
-fi
+AS_IF([test "x$enable_logging" = "xyes"], [ AC_DEFINE(ENABLE_LOGGING, [1], [System logging.]) ])
 
 AC_ARG_WITH(firmware-path,
 	AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
@@ -72,25 +68,21 @@ AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 AC_ARG_WITH([systemdsystemunitdir],
 	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
 	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-if test "x$with_systemdsystemunitdir" != xno; then
-	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ])
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ])
 
 # ------------------------------------------------------------------------------
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([gudev],
-	AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support]),
+	AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
 	[], [enable_gudev=yes])
-if test "x$enable_gudev" = xyes; then
-	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
-fi
+AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ])
 
 AC_ARG_ENABLE([introspection],
-	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
+	AS_HELP_STRING([--disable-introspection], [disable GObject introspection @<:@default=enabled@:>@]),
 	[], [enable_introspection=yes])
-if test "x$enable_introspection" = xyes; then
+AS_IF([test "x$enable_introspection" = "xyes"], [
 	PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
 	AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
 	AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
@@ -98,18 +90,17 @@ if test "x$enable_introspection" = xyes; then
 	AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
 	AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
 	AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
-fi
-AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
-
-AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
+])
+AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
+AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # usb/pci-db - read vendor/device string database
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([hwdb],
-	AS_HELP_STRING([--disable-hwdb], [disable hardware database support]),
+	AS_HELP_STRING([--disable-hwdb], [disable hardware database support @<:@default=enabled@:>@]),
 	[], [enable_hwdb=yes])
-if test "x$enable_hwdb" = xyes; then
+AS_IF([test "x$enable_hwdb" = "xyes"], [
 	if test "x$cross_compiling" = "xno" ; then
 		AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
 		AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
@@ -140,16 +131,16 @@ if test "x$enable_hwdb" = xyes; then
 	AC_MSG_CHECKING([for PCI database location])
 	AC_MSG_RESULT([$PCI_DATABASE])
 	AC_SUBST(PCI_DATABASE)
-fi
-AM_CONDITIONAL([ENABLE_HWDB], [test "x$enable_hwdb" = xyes])
+])
+AM_CONDITIONAL([ENABLE_HWDB], [test "x$enable_hwdb" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([keymap],
-	AS_HELP_STRING([--disable-keymap], [disable keymap fixup support]),
+	AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]),
 	[], [enable_keymap=yes])
-if test "x$enable_keymap" = xyes; then
+AS_IF([test "x$enable_keymap" = "xyes"], [
 	AC_PATH_PROG([GPERF], [gperf])
 	if test -z "$GPERF"; then
 		AC_MSG_ERROR([gperf is needed])
@@ -157,54 +148,54 @@ if test "x$enable_keymap" = xyes; then
 
 	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
 	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
-fi
-AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = xyes])
+])
+AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # mtd_probe - autoloads FTL module for mtd devices
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([mtd_probe],
-	AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]),
+	AS_HELP_STRING([--disable-mtd_probe], [disable MTD support @<:@default=enabled@:>@]),
 	[], [enable_mtd_probe=yes])
-AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = xyes])
+AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([rule_generator],
-	AS_HELP_STRING([--enable-rule_generator], [enable persistent network + cdrom links support]),
+	AS_HELP_STRING([--enable-rule_generator], [enable persistent network + cdrom links support @<:@default=disabled@:>@]),
 	[], [enable_rule_generator=no])
-AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes])
+AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # udev_acl - apply ACLs for users with local forground sessions
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([udev_acl],
-	AS_HELP_STRING([--enable-udev_acl], [enable local user acl permissions support]),
+	AS_HELP_STRING([--enable-udev_acl], [enable local user acl permissions support @<:@default=disabled@:>@]),
 	[], [enable_udev_acl=no])
-if test "x$enable_udev_acl" = xyes; then
+AS_IF([test "x$enable_udev_acl" = "xyes"], [
 	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
 	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
 
 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
-fi
-AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = xyes])
+])
+AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([floppy],
-	AS_HELP_STRING([--enable-floppy], [enable legacy floppy support]),
+	AS_HELP_STRING([--enable-floppy], [enable legacy floppy support @<:@default=disabled@:>@]),
 	[], [enable_floppy=no])
-AM_CONDITIONAL([ENABLE_FLOPPY], [test "x$enable_floppy" = xyes])
+AM_CONDITIONAL([ENABLE_FLOPPY], [test "x$enable_floppy" = "xyes"])
 
 # ------------------------------------------------------------------------------
 # edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([edd],
-	AS_HELP_STRING([--enable-edd], [enable disk edd support]),
+	AS_HELP_STRING([--enable-edd], [enable disk edd support @<:@default=disabled@:>@]),
 	[], [enable_edd=no])
-AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
+AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = "xyes"])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
@@ -223,7 +214,7 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 AC_MSG_RESULT([
-	udev $VERSION
+	$PACKAGE $VERSION
 	========
 
 	prefix:			${prefix}
diff --git a/libudev/libudev.pc.in b/libudev/libudev.pc.in
index f75794ceb8..93c8366480 100644
--- a/libudev/libudev.pc.in
+++ b/libudev/libudev.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=@prefix@
+exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@prefix@/include
+includedir=@includedir@
 
 Name: libudev
 Description: Library to access udev device information