From 1300fc19cbb483f6ed999b40c97fd9c311f5e35b Mon Sep 17 00:00:00 2001
From: Peter Marschall <peter@adpm.de>
Date: Fri, 20 Apr 2012 17:36:38 +0200
Subject: [PATCH] rcapid/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
---
 rcapid/configure.ac | 31 +++++++++++++++++++++++++++++++
 rcapid/configure.in | 44 --------------------------------------------
 2 files changed, 31 insertions(+), 44 deletions(-)
 create mode 100644 rcapid/configure.ac
 delete mode 100644 rcapid/configure.in

diff --git a/rcapid/configure.ac b/rcapid/configure.ac
new file mode 100644
index 00000000..18196422
--- /dev/null
+++ b/rcapid/configure.ac
@@ -0,0 +1,31 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.68])
+
+AC_INIT([rcapid], [1.2])
+AM_INIT_AUTOMAKE
+AC_PREFIX_DEFAULT([/usr])
+
+CONFIG_SBINDIR=${sbindir:-"/sbin"}
+CONFIG_MANDIR=${mandir:-"/usr/man"}
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h)
+
+dnl Checks for library functions.
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS(socket)
+
+dnl Define which variables to substitute & which files to generate
+AC_SUBST(CONFIG_SBINDIR)
+AC_SUBST(CONFIG_MANDIR)
+
+AC_OUTPUT(Makefile)
diff --git a/rcapid/configure.in b/rcapid/configure.in
deleted file mode 100644
index b75609cb..00000000
--- a/rcapid/configure.in
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rcapid.c)
-AM_INIT_AUTOMAKE(rcapid, 1.2)
-AC_PREFIX_DEFAULT(/usr)
-
-CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
-CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_HEADER_STDC
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(socket)
-
-dnl Optional sbin directory
-AC_ARG_WITH(sbin,
-	[  --with-sbin=DIR         Set dir where binary is installed. [/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(CONFIG_SBINDIR)
-AC_SUBST(CONFIG_MANDIR)
-AC_SUBST(INSTALL)
-AC_OUTPUT(Makefile)