From fdb3a486fff2196f43944019d89afb58c47ecaa8 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 7 Oct 2006 13:24:02 +0000 Subject: 2006-10-07 Thomas Schwinge * Drivers.macros (AC_DRIVER, AC_DRIVER_nodef): Rewrite to allow options with dashes in them, make it usable more universally and enhance the generated comments in header files. * i386/linux/configure.ac (linux_DRIVER, linux_DRIVER_nodef): Enhance DESCRIPTION. (u1434f): Rename to `u14-34f'. (smcultra): Rename to `smc-ultra'. (smcultra32): Rename to `smc-ultra32'. (hpplus): Rename to `hp-plus'. (ne2kpci): Rename to `ne2k-pci'. (viarhine): Rename to `via-rhine'. (intelgige): Rename to `intel-gige'. (winbond840): Rename to `winbond-840'. (AC_PCMCIA_OPTION): Remove function. (pcmcia-isa): Use `AC_DRIVER' instead of `AC_PCMCIA_OPTION'. * i386/README-Drivers: Update accordingly. --- Drivers.macros | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Drivers.macros') diff --git a/Drivers.macros b/Drivers.macros index d7168fa..6d882d6 100644 --- a/Drivers.macros +++ b/Drivers.macros @@ -36,11 +36,12 @@ dnl By default, the value from $enable_default_device_drivers is considered dnl when deciding whether to activate the device driver or not. AC_DEFUN([AC_DRIVER], [ +unset enableval AC_ARG_ENABLE([$1], - AS_HELP_STRING([--disable-$1], [disable driver $2])) -[enable_$1=${enable_$1-$enable_default_device_drivers} -if test x"$enable_$1" = xyes; then] - AC_DEFINE([$3], [1], [$1]) + AS_HELP_STRING([--disable-$1], [disable $2])) +[enableval=${enableval-$enable_default_device_drivers} +if test x"$enableval" = xyes; then] + AC_DEFINE([$3], [1], [$1: $2]) [device_drivers="$device_drivers $4" if test "${driver_class_$5_selected+set}" != set; then driver_class_$5_selected=yes] @@ -54,9 +55,9 @@ dnl $enable_default_device_drivers. AC_DEFUN([AC_DRIVER_nodef], [ AC_ARG_ENABLE([$1], - AS_HELP_STRING([--enable-$1], [enable driver $2]), [ + AS_HELP_STRING([--enable-$1], [enable $2]), [ if test x"$enableval" = xyes; then - AC_DEFINE([$3], [1], [$1]) + AC_DEFINE([$3], [1], [$1: $2]) device_drivers="$device_drivers $4" if test "${driver_class_$5_selected+set}" != set; then driver_class_$5_selected=yes -- cgit v1.2.3