From 20ad35d0209e38f307cd0b5188d2090370912565 Mon Sep 17 00:00:00 2001 From: Peter Marschall Date: Sat, 21 Apr 2012 19:55:36 +0200 Subject: [PATCH] act2000/configure.ac: updated from configure.in * rename configure.in to configure.ac for recent autotools * require autoconf 2.68 * update/remove obsolete macros * quote arguments to AC_../AM_.. macros * remove unneeded options --with-sbin / --with-man: --sbindir / --mandir serve exactly the same purpose --- act2000/{configure.in => configure.ac} | 32 ++++++++------------------ 1 file changed, 9 insertions(+), 23 deletions(-) rename act2000/{configure.in => configure.ac} (50%) diff --git a/act2000/configure.in b/act2000/configure.ac similarity index 50% rename from act2000/configure.in rename to act2000/configure.ac index 886dc0df..d7ece358 100644 --- a/act2000/configure.in +++ b/act2000/configure.ac @@ -1,12 +1,15 @@ dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.68]) + AC_INIT(actctrl.c) AC_PREFIX_DEFAULT(/usr) I4LCONFDIR=${I4LCONFDIR:-"/etc/isdn"} I4LVERSION=${I4LVERSION:-"?.?"} CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn"} -CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}` -CONFIG_SBINDIR=`eval echo ${CONFIG_CARD_SBINDIR:-"/sbin"}` +CONFIG_MANDIR=${mandir:-"/usr/man"} +CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"} MANDATE=`grep CHECKIN actctrl.man.in | awk '{print $4}'` dnl Checks for programs. @@ -19,38 +22,21 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h) -dnl Checks for typedefs, structures, and compiler characteristics. - dnl Checks for library functions. -AC_PROG_GCC_TRADITIONAL AC_FUNC_MMAP dnl Optional firmware directory AC_ARG_WITH(firmware, - [ --with-firmware=DIR Set dir where firmware istalled. [/usr/lib/isdn]], - CONFIG_DATADIR="${withval}" - AC_DEFINE(CONFIG_DATADIR,"${withval}"), + [ --with-firmware=DIR Set dir where firmware installed. [/usr/lib/isdn]], + AC_DEFINE(CONFIG_DATADIR, "${withval}", [directory where firmware installed]), ) -dnl Optional sbin directory -AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" - AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -) - -dnl Optional man directory -AC_ARG_WITH(man, - [ --with-man=DIR Set manpage dir. [/usr/man]], - CONFIG_MANDIR="${withval}" - AC_DEFINE(CONFIG_MANDIR,"${withval}"), -) - -AC_SUBST(INSTALL) +dnl Define which variables to substitute & which files to generate AC_SUBST(MANDATE) AC_SUBST(CONFIG_DATADIR) AC_SUBST(CONFIG_SBINDIR) AC_SUBST(CONFIG_MANDIR) AC_SUBST(I4LCONFDIR) AC_SUBST(I4LVERSION) + AC_OUTPUT(Makefile actctrl.man)