From dfe464fba28e67d47f44673978eba64492ce51db Mon Sep 17 00:00:00 2001 From: Peter Marschall Date: Sat, 21 Apr 2012 09:53:22 +0200 Subject: [PATCH] capifax/configure.ac: updated from configure.in * rename configure.in to configure.ac for recent autotools * require autoconf 2.68 * update obsolete macros * quote arguments to AC_../AM_.. macros * remove unneeded options --with-sbin / --with-man: --sbindir / --mandir serve exactly the same purpose --- capifax/configure.ac | 31 +++++++++++++++++++++++++++++ capifax/configure.in | 47 -------------------------------------------- 2 files changed, 31 insertions(+), 47 deletions(-) create mode 100644 capifax/configure.ac delete mode 100644 capifax/configure.in diff --git a/capifax/configure.ac b/capifax/configure.ac new file mode 100644 index 00000000..9628b83e --- /dev/null +++ b/capifax/configure.ac @@ -0,0 +1,31 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.68]) + +AC_INIT([capifax], [1.0]) +AM_INIT_AUTOMAKE +AC_PREFIX_DEFAULT([/usr]) + +CONFIG_SBINDIR=${sbindir:-"/sbin"} +CONFIG_MANDIR=${mandir:-"/usr/man"} + +dnl Checks for programs. +AC_PROG_INSTALL +AC_PROG_CC + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(sys/ioctl.h unistd.h) +AC_CHECK_FILE([../capi20/capi20.h], CPPFLAGS="-I ../capi20 $CPPFLAGS") +AC_CHECK_HEADER([capi20.h],[],[AC_MSG_ERROR([capi20.h not found])]) + +dnl Checks for typedefs, structures, and compiler characteristics. +CS_TEST_ALERT +CS_TEST_GLOBALCONFIG + +dnl Define which variables to substitute & which files to generate +AC_SUBST(CONFIG_SBINDIR) +AC_SUBST(CONFIG_MANDIR) +AM_CONFIG_HEADER(config.h) + +AC_OUTPUT(Makefile) diff --git a/capifax/configure.in b/capifax/configure.in deleted file mode 100644 index d4f6660e..00000000 --- a/capifax/configure.in +++ /dev/null @@ -1,47 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(capifax.c) -AM_INIT_AUTOMAKE(capifax, 1.0) -AC_PREFIX_DEFAULT(/usr) - -CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} -CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} -#MANDATE=`grep CHECKIN isdnctrl.man.in | awk '{print $4}'` - -dnl Checks for programs. -AC_PROG_INSTALL -AC_PROG_CC - -dnl Checks for libraries. - -dnl Checks for header files. -AC_HEADER_STDC -dnl capi20.h not used AC_CHECK_HEADERS(sys/ioctl.h unistd.h capi20.h) -AC_CHECK_HEADERS(sys/ioctl.h unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. - -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}", [capifax sbin directory]), -) - -dnl Optional man directory -AC_ARG_WITH(man, - [ --with-man=DIR Set manpage dir. [/usr/man]], - CONFIG_MANDIR="${withval}" - AC_DEFINE(CONFIG_MANDIR,"${withval}", [capifax manual directory]), -) - -AC_CHECK_FILE([../capi20/capi20.h],CPPFLAGS="-I ../capi20 $CPPFLAGS") -AC_CHECK_HEADER([capi20.h],[],[AC_MSG_ERROR([capi20.h not found])]) - -CS_TEST_ALERT -CS_TEST_GLOBALCONFIG - -AC_SUBST(INSTALL) -AC_SUBST(CONFIG_SBINDIR) -AC_SUBST(CONFIG_MANDIR) -AM_CONFIG_HEADER(config.h) -AC_OUTPUT(Makefile)