capiinit/configure.ac: update & autoreconf

* remove unnecessary macros & symbols
* add evaluation for I4LCONFDIR
This commit is contained in:
Peter Marschall 2012-04-22 14:20:58 +02:00
parent 0b411f112f
commit deae31548f
4 changed files with 16 additions and 13 deletions

View File

@ -119,9 +119,6 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
CONFIG_FIRMWAREDIR = @CONFIG_FIRMWAREDIR@
CONFIG_MANDIR = @CONFIG_MANDIR@
CONFIG_SBINDIR = @CONFIG_SBINDIR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@ -133,6 +130,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
I4LCONFDIR = @I4LCONFDIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@

View File

@ -33,6 +33,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* directory for configuration files */
#undef I4LCONFDIR
/* Name of package */
#undef PACKAGE

14
capiinit/configure vendored
View File

@ -603,9 +603,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
CONFIG_FIRMWAREDIR
CONFIG_MANDIR
CONFIG_SBINDIR
I4LCONFDIR
EGREP
GREP
CPP
@ -2505,7 +2503,13 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
I4LCONFDIR=${syconfdir:-"/etc/isdn"}
cat >>confdefs.h <<_ACEOF
#define I4LCONFDIR "${I4LCONFDIR}"
_ACEOF
ac_ext=c
@ -3916,8 +3920,6 @@ done
ac_config_headers="$ac_config_headers config.h"

View File

@ -6,7 +6,9 @@ AC_INIT([capiiniti], [1.0])
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT([/])
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
I4LCONFDIR=${syconfdir:-"/etc/isdn"}
AC_DEFINE_UNQUOTED(I4LCONFDIR, "${I4LCONFDIR}", [directory for configuration files])
dnl Checks for programs.
AC_PROG_INSTALL
@ -19,9 +21,7 @@ AC_CHECK_HEADERS(linux/capi.h,,
AC_CHECK_HEADERS(capi20.h)
dnl Define which variables to substitute & which files to generate
AC_SUBST(CONFIG_SBINDIR)
AC_SUBST(CONFIG_MANDIR)
AC_SUBST(CONFIG_FIRMWAREDIR)
AC_SUBST(I4LCONFDIR)
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile)