From 1db00cf986b54d932643f262395a7e628746801c Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Fri, 5 Jan 2018 23:28:40 +0100 Subject: flattened directory non-working --- libre/isdnutils-dfsg/PKGBUILD | 101 ++ libre/isdnutils-dfsg/modern-autoconf.patch | 1313 ++++++++++++++++++++ libre/non-working/isdnutils-dfsg/PKGBUILD | 101 -- .../isdnutils-dfsg/modern-autoconf.patch | 1313 -------------------- 4 files changed, 1414 insertions(+), 1414 deletions(-) create mode 100644 libre/isdnutils-dfsg/PKGBUILD create mode 100644 libre/isdnutils-dfsg/modern-autoconf.patch delete mode 100644 libre/non-working/isdnutils-dfsg/PKGBUILD delete mode 100644 libre/non-working/isdnutils-dfsg/modern-autoconf.patch diff --git a/libre/isdnutils-dfsg/PKGBUILD b/libre/isdnutils-dfsg/PKGBUILD new file mode 100644 index 000000000..1ff0b451a --- /dev/null +++ b/libre/isdnutils-dfsg/PKGBUILD @@ -0,0 +1,101 @@ +# Maintainer: Luke Shumaker + +# Debian information +_debname=isdnutils +_debver=3.25+dfsg1 +_debrel=3.5 +_debrepo=http://ftp.debian.org/debian/pool/main + +pkgname=${_debname}-dfsg +pkgver=${_debver/+dfsg/.}.${_debrel} +pkgdesc="Debian's user space administration programs and tools for ISDN" +url="http://packages.debian.org/source/sid/isdnutils" +license=( + 'GPL2' 'LGPL2' # most everything + 'custom' # Mini-FAQ + 'ZLIB' # areacode + 'BSD4' 'BSD4-modified' 'BSD3' 'BSD2' 'MIT' # ipppd + 'X11' # xisdnload +) + +_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } +source=($(_debfile ${_debname}_${_debver}-${_debrel}.dsc) + $(_debfile ${_debname}_${_debver}.orig.tar.bz2) + $(_debfile ${_debname}_${_debver}-${_debrel}.debian.tar.xz) + modern-autoconf.patch +) +noextract=("${source[@]##*/}") +md5sums=('19d43212c307d30db9dad2413e84374b' + '38841f0c697d49fd71ff91e9188f6d4c' + '68b901c1553771bcef9a9297a93c4a46' + '9fa4158b19d5c9b774d14af34767ef1b') + +# Package meta-data +pkgrel=1 +arch=(i686 x86_64) +depends=(sh) +makedepends=(imake dpkg-devtools linuxdoc-tools zip linux-api-headers) +optdepends=( + "ncurses: for imon and vbox" + "tcl: for vbox" +) +makedepends+=("${optdepends[@]%%:*}") + +# isdnutils-dpkg replaces isdn4k-utils(Arch) replaces capi4k-utils(Arch) +replaces=('isdn4k-utils' 'capi4k-utils') +provides=("isdn4k-utils=$pkgver") + +#### + +# Use `make -j1` because the cappiinfo subdir depends on capi20, and +# automake has no way of expressing this. +prepare() { + cd "$srcdir" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc $pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver + + find . -name configure.in -execdir mv {} configure.ac \; + patch -p1 -i ../modern-autoconf.patch + ( + set -o pipefail + find * -name configure.ac -printf '%h\n' | + while read -r dir; do + echo "Running \`autoreconf -if' in \`$dir'..." + pushd "$dir" >/dev/null + autoreconf -if |& sed 's,^, ,' + popd >/dev/null + done + ) + + sed \ + -e "s#@KERNELDIR@#/usr/include/linux#" \ + -e "s#@LIBDIR@#/usr/lib#" \ + debian/dotconfig > .config +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make -j1 subconfig + make -j1 + make -j1 -C isdnlog/tools/zone zonefiles + make -j1 -C Mini-FAQ +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + mkdir -p "$pkgdir"/usr/bin + ln -s bin "$pkgdir"/usr/sbin + ln -s usr/bin "$pkgdir"/bin + ln -s usr/bin "$pkgdir"/sbin + + make -j1 install DESTDIR="$pkgdir" + install -Dm644 debian/copyright "$pkgdir"/usr/share/licenses/$pkgname/copyright + + rm "$pkgdir"/{bin,sbin,usr/sbin} + + # The following is adapted debian/rules:override_dh_auto_install + mv "$pkgdir"/usr/share/man/man5/vbox{_file,}.5 + install -Dm0644 vbox/examples/vboxrc.example "$pkgdir"/usr/share/doc/isdnvboxclient/examples/vboxrc +} diff --git a/libre/isdnutils-dfsg/modern-autoconf.patch b/libre/isdnutils-dfsg/modern-autoconf.patch new file mode 100644 index 000000000..f80f34f54 --- /dev/null +++ b/libre/isdnutils-dfsg/modern-autoconf.patch @@ -0,0 +1,1313 @@ +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/Makefile isdnutils-dfsg-3.25.1.3.5/Makefile +--- isdnutils-dfsg-3.25.1.3.5.orig/Makefile 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/Makefile 2014-11-19 00:41:00.452734610 -0500 +@@ -53,10 +53,10 @@ + endif + + ifeq ($(CONFIG_RCAPID),y) +- SUBDIRS := $(SUBDIRS) capiinfo ++ SUBDIRS := $(SUBDIRS) capi20 capiinfo + else + ifeq ($(CONFIG_AVMCAPICTRL),y) +- SUBDIRS := $(SUBDIRS) capiinfo ++ SUBDIRS := $(SUBDIRS) capi20 capiinfo + endif + endif + +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac 2014-11-19 00:41:00.452734610 -0500 +@@ -1,7 +1,10 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.50) +-AC_INIT(capi20.c) ++AC_INIT(libcapi20, ${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE}) ++AC_CONFIG_SRCDIR(capi20.c) ++AM_INIT_AUTOMAKE ++ + AC_ARG_ENABLE([V2], + AS_HELP_STRING([--enable-V2],[build libcapi20 version 2 compatible library]), + [case "${enableval}" in +@@ -22,7 +25,6 @@ + LIBCAPI_VERSION_RELEASE=6 + ]) + +-AM_INIT_AUTOMAKE(libcapi20,${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE}) + AC_PREFIX_DEFAULT(/usr) + AC_SUBST(BUILD) + +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am 2014-11-19 00:42:07.217978987 -0500 +@@ -7,9 +7,9 @@ + MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ + stamp-h.in + +-INCLUDES = $(all_includes) ++AM_CPPFLAGS = -I../capi20 $(all_includes) + CFLAGS = -Wall -O2 +-LDFLAGS = $(all_libraries) ++LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) + LDADD = -lcapi20 + + bin_PROGRAMS = capifax capifaxrcvd +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac 2014-11-19 00:41:00.456067872 -0500 +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(capifax.c) +-AM_INIT_AUTOMAKE(capifax, 1.0) ++AC_INIT(capifax, 1.0) ++AC_CONFIG_SRCDIR(capifax.c) ++AM_INIT_AUTOMAKE + AC_PREFIX_DEFAULT(/usr) + + CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am 2014-11-19 00:41:00.456067872 -0500 +@@ -7,9 +7,9 @@ + MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ + stamp-h.in comperr + +-INCLUDES = $(all_includes) ++AM_CPPFLAGS = -I../capi20 $(all_includes) + CFLAGS = -Wall -O2 +-LDFLAGS = $(all_libraries) ++LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) + LDADD = -lcapi20 + + bin_PROGRAMS = capiinfo +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac 2014-11-19 00:41:00.456067872 -0500 +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(capiinfo.c) +-AM_INIT_AUTOMAKE(capiinfo, 1.0) ++AC_INIT(capiinfo, 1.0) ++AC_CONFIG_SRCDIR(capiinfo.c) ++AM_INIT_AUTOMAKE + AC_PREFIX_DEFAULT(/usr) + + I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am 2014-11-19 00:41:00.456067872 -0500 +@@ -7,7 +7,7 @@ + MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ + stamp-h.in comperr core + +-INCLUDES = $(all_includes) ++AM_CPPFLAGS = $(all_includes) + CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g + LDFLAGS = $(all_libraries) + LDADD = +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac 2014-11-19 00:41:00.456067872 -0500 +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(capiinit.c) +-AM_INIT_AUTOMAKE(capiinit, 1.0) ++AC_INIT(capiinit, 1.0) ++AC_CONFIG_SRCDIR(capiinit.c) ++AM_INIT_AUTOMAKE + AC_PREFIX_DEFAULT(/) + + CONFIG_SBINDIR$=${CONFIG_CARD_SBINDIR:-"/sbin"} +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac isdnutils-dfsg-3.25.1.3.5/imon/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/imon/configure.ac 2014-11-19 00:41:00.459401135 -0500 +@@ -4,8 +4,8 @@ + AC_PREFIX_DEFAULT(/usr) + + I4LVERSION=${I4LVERSION:-"?.?"} +-CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}` +-CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}` ++CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} ++CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} + MANDATE=`grep CHECKIN imon.man.in | awk '{print $4}'` + + dnl Checks for programs. +@@ -38,14 +38,14 @@ + AC_ARG_WITH(sbin, + [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], + CONFIG_SBINDIR="${withval}" +- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), ++ AC_DEFINE(CONFIG_SBINDIR,"${withval}", [imon 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}"), ++ AC_DEFINE(CONFIG_MANDIR,"${withval}", [imon manual directory]), + ) + + AC_SUBST(INSTALL) +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac 2014-11-19 00:41:00.459401135 -0500 +@@ -30,21 +30,21 @@ + AC_ARG_WITH(sbin, + [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], + CONFIG_SBINDIR="${withval}" +- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), ++ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[isdnctrl 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}"), ++ AC_DEFINE(CONFIG_MANDIR,"${withval}",[isdn manual directory]), + ) + + dnl Optional config-file-option + AC_ARG_ENABLE(cfile, + [ --enable-cfile Enable configfile option [no]], + CONFIG_ISDNCTRL_CONF=y +- AC_DEFINE(CONFIG_ISDNCTRL_CONF,y), ++ AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable isdnctrl config file]), + ) + + AC_SUBST(INSTALL) +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 2014-11-19 00:41:00.459401135 -0500 +@@ -2,7 +2,7 @@ + dnl Check for postgres + dnl + +-AC_DEFUN(AC_CHECK_POSTGRES, [ ++AC_DEFUN([AC_CHECK_POSTGRES], [ + POSTGRESDIR="" + pqdir="no" + tst_postgresdir="$CONFIG_ISDNLOG_POSTGRESDIR" +@@ -45,13 +45,13 @@ + if test "$pqdir" != "no" ; then + AC_MSG_RESULT("yes") + POSTGRES=1 +- AC_DEFINE_UNQUOTED(POSTGRES,1) ++ AC_DEFINE_UNQUOTED(POSTGRES,1,[Define to 1 if postgres should be used]) + else + AC_MSG_RESULT("no POSTGRES DISABLED") + pqdir="" + fi + POSTGRESDIR="$pqdir" +- AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir") ++ AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[Define to the prefix that postgres was installed to.]) + AC_SUBST(POSTGRES) + AC_SUBST(POSTGRESDIR) + ]) +@@ -59,7 +59,7 @@ + dnl Check for mysql + dnl + +-AC_DEFUN(AC_CHECK_MYSQLDB, [ ++AC_DEFUN([AC_CHECK_MYSQLDB], [ + MYSQLDIR="" + mydir="no" + tst_mysqldir="$CONFIG_ISDNLOG_MYSQLDIR" +@@ -108,13 +108,13 @@ + if test "$mydir" != "no" ; then + AC_MSG_RESULT("yes") + MYSQLDB=1 +- AC_DEFINE_UNQUOTED(MYSQLDB,1) ++ AC_DEFINE_UNQUOTED(MYSQLDB,1,[Define to 1 if mysql should be used]) + else + AC_MSG_RESULT("no MYSQL DISABLED") + mydir="" + fi + MYSQLDIR="$mydir" +- AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir") ++ AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[Define to the prefix that postgres was installed to.]) + AC_SUBST(MYSQLDB) + AC_SUBST(MYSQLDIR) + ]) +@@ -123,7 +123,7 @@ + dnl Check for Oracle + dnl + +-AC_DEFUN(AC_CHECK_ORACLE, [ ++AC_DEFUN([AC_CHECK_ORACLE], [ + oradir="no" + if test "$ORACLE_HOME" != "" && test "$CONFIG_ISDNLOG_ORACLE" = "y" ; then + AC_MSG_CHECKING([for Oracle in ${ORACLE_HOME}]) +@@ -134,7 +134,7 @@ + if test "$oradir" != "no" ; then + AC_MSG_RESULT("yes") + ORACLE=1 +- AC_DEFINE_UNQUOTED(ORACLE,1) ++ AC_DEFINE_UNQUOTED(ORACLE,1,[Define to 1 if oracle should b used]) + else + AC_MSG_RESULT("no ORACLE DISABLED") + fi +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 2014-11-19 00:41:00.459401135 -0500 +@@ -15,7 +15,7 @@ + dnl PARTICULAR PURPOSE. + + +-AC_DEFUN(AC_FIND_FILE, ++AC_DEFUN([AC_FIND_FILE], + [ + $3=NO + for i in $2; +@@ -30,7 +30,7 @@ + done + ]) + +-AC_DEFUN(AC_PATH_QT_DIRECT, ++AC_DEFUN([AC_PATH_QT_DIRECT], + [if test "$ac_qt_includes" = NO; then + AC_TRY_CPP([#include ], + [ +@@ -40,14 +40,14 @@ + fi + ]) + +-AC_DEFUN(AC_PATH_QT_MOC, ++AC_DEFUN([AC_PATH_QT_MOC], + [ + AC_PATH_PROG(MOC, moc, /usr/bin/moc, + $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin) + ]) + + +-AC_DEFUN(AC_CREATE_KFSSTND, ++AC_DEFUN([AC_CREATE_KFSSTND], + [ + + kde_htmldir="\$(prefix)/share/doc/HTML" +@@ -75,59 +75,9 @@ + + ]) + +-AC_DEFUN(K_PATH_X, ++AC_DEFUN([AC_PATH_QT_1_3], + [ +-AC_MSG_CHECKING(for X) +-AC_CACHE_VAL(ac_cv_have_x, +-[# One or both of the vars are not set, and there is no cached value. +-ac_x_includes=NO ac_x_libraries=NO +-AC_PATH_X_DIRECT +-AC_PATH_X_XMKMF +-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then +- AC_MSG_ERROR([Can't find X. Please add the correct paths. View configure --help for usage!]) +-else +- # Record where we found X for the cache. +- ac_cv_have_x="have_x=yes \ +- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +-fi])dnl +-eval "$ac_cv_have_x" +- +-if test "$have_x" != yes; then +- AC_MSG_RESULT($have_x) +- no_x=yes +-else +- # If each of the values was on the command line, it overrides each guess. +- test "x$x_includes" = xNONE && x_includes=$ac_x_includes +- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries +- # Update the cache value to reflect the command line values. +- ac_cv_have_x="have_x=yes \ +- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- AC_MSG_RESULT([libraries $x_libraries, headers $x_includes]) +-fi +- +-if test -z "$x_includes" || test "x$x_includes" = xNONE; then +- X_INCLUDES="" +- x_includes="."; dnl better than nothing :- +- else +- X_INCLUDES="-I$x_includes" +-fi +- +-if test -z "$x_libraries" || test "$x_libraries" = xNONE; then +- X_LDFLAGS="" +- x_libraries="/usr/lib"; dnl better than nothing :- +- all_libraries="" +- else +- X_LDFLAGS="-L$x_libraries" +- all_libraries=$X_LDFLAGS +-fi +- +-AC_SUBST(X_INCLUDES) +-AC_SUBST(X_LDFLAGS) +-all_includes=$X_INCLUDES +-]) +-AC_DEFUN(AC_PATH_QT_1_3, +-[ +-AC_REQUIRE([K_PATH_X]) ++AC_REQUIRE([AC_PATH_X]) + + AC_MSG_CHECKING([for QT-1.30]) + ac_qt_includes=NO ac_qt_libraries=NO +@@ -256,12 +206,12 @@ + AC_PATH_QT_MOC + ]) + +-AC_DEFUN(AC_PATH_QT, ++AC_DEFUN([AC_PATH_QT], + [ + AC_PATH_QT_1_3 + ]) + +-AC_DEFUN(AC_PATH_KDE, ++AC_DEFUN([AC_PATH_KDE], + [ + AC_REQUIRE([AC_PATH_QT])dnl + AC_MSG_CHECKING([for KDE]) +@@ -340,43 +290,7 @@ + AC_CREATE_KFSSTND + ]) + +-dnl slightly changed version of AC_CHECK_FUNC(setenv) +-AC_DEFUN(AC_CHECK_SETENV, +-[AC_MSG_CHECKING([for setenv]) +-AC_CACHE_VAL(ac_cv_func_setenv, +-[AC_LANG_C +-AC_TRY_LINK( +-dnl Don't include because on OSF/1 3.0 it includes +-dnl which includes which contains a prototype for +-dnl select. Similarly for bzero. +-[#include +-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" +-#endif +-])dnl +-[/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-#include +-], [ +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$1) || defined (__stub___$1) +-choke me +-#else +-setenv("TEST", "alle", 1); +-#endif +-], eval "ac_cv_func_setenv=yes", eval "ac_cv_func_setenv=no")]) +- +-if test "$ac_cv_func_setenv" = "yes"; then +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(HAVE_FUNC_SETENV) +-else +- AC_MSG_RESULT(no) +-fi +-]) +- +-AC_DEFUN(AC_FIND_GIF, ++AC_DEFUN([AC_FIND_GIF], + [AC_MSG_CHECKING(for giflib) + AC_CACHE_VAL(ac_cv_lib_gif, + [ac_save_LIBS="$LIBS" +@@ -407,7 +321,7 @@ + fi + ]) + +-AC_DEFUN(AC_FIND_JPEG, ++AC_DEFUN([AC_FIND_JPEG], + [AC_MSG_CHECKING(for jpeglib) + AC_CACHE_VAL(ac_cv_lib_jpeg, + [ac_save_LIBS="$LIBS" +@@ -464,7 +378,7 @@ + fi + ]) + +-AC_DEFUN(AC_CHECK_BOOL, ++AC_DEFUN([AC_CHECK_BOOL], + [ + AC_MSG_CHECKING(for bool) + AC_CACHE_VAL(ac_cv_have_bool, +@@ -481,7 +395,7 @@ + fi + ]) + +-AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, ++AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], + [ + AC_MSG_CHECKING(if you need GNU extensions) + cat > conftest.c << EOF +@@ -502,7 +416,7 @@ + fi + ]) + +-AC_DEFUN(AC_CHECK_WITH_GCC, ++AC_DEFUN([AC_CHECK_WITH_GCC], + [ + AC_ARG_WITH(gcc-flags,[ --without-gcc-flags don't use gcc flags [default=no]]) + if test "x$with_gcc_flags" = "xno"; then +@@ -513,7 +427,7 @@ + ]) + + +-AC_DEFUN(AC_SET_DEBUG, ++AC_DEFUN([AC_SET_DEBUG], + [ + if test "x$ac_use_gcc_flags" = "xyes"; then + test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG" +@@ -522,7 +436,7 @@ + fi + ]) + +-AC_DEFUN(AC_SET_NODEBUG, ++AC_DEFUN([AC_SET_NODEBUG], + [ + if test "x$ac_use_gcc_flags" = "xyes"; then + test "$CFLAGS" = "" && CFLAGS="-O2 -Wall" +@@ -531,7 +445,7 @@ + fi + ]) + +-AC_DEFUN(AC_CHECK_DEBUG, ++AC_DEFUN([AC_CHECK_DEBUG], + [ + AC_ARG_ENABLE(debug,[ --enable-debug creates debugging code [default=no]], + [ +@@ -544,7 +458,7 @@ + ]) + + dnl just a test +-AC_DEFUN(AC_CHECK_FLAGS, ++AC_DEFUN([AC_CHECK_FLAGS], + [ + AC_REQUIRE([AC_CHECK_WITH_GCC]) + AC_REQUIRE([AC_CHECK_DEBUG]) +@@ -554,7 +468,7 @@ + ]) + + dnl Check for the type of the third argument of getsockname +-AC_DEFUN(AC_CHECK_KSIZE_T, ++AC_DEFUN([AC_CHECK_KSIZE_T], + [AC_MSG_CHECKING(for the third argument of getsockname) + AC_CACHE_VAL(ac_cv_ksize_t_int, + [AC_TRY_COMPILE([#include +@@ -573,7 +487,7 @@ + + dnl This is a merge of some macros out of the gettext aclocal.m4 + dnl since we don't need anything, I took the things we need +-AC_DEFUN(AM_KDE_WITH_NLS, ++AC_DEFUN([AM_KDE_WITH_NLS], + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, +@@ -586,10 +500,10 @@ + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) + +- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, ++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, ++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + +@@ -610,57 +524,12 @@ + + ]) + +-# Search path for a program which passes the given test. +-# Ulrich Drepper , 1996. +- +-# serial 1 +-# Stephan Kulow: I appended a _KDE against name conflicts +- +-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN(AM_PATH_PROG_WITH_TEST_KDE, +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test -n "[$]$1"; then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl +-]) +- +- + # Check whether LC_MESSAGES is available in . + # Ulrich Drepper , 1995. + + # serial 1 + +-AC_DEFUN(AM_LC_MESSAGES, ++AC_DEFUN([AM_LC_MESSAGES], + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], +@@ -669,191 +538,11 @@ + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) +- +-dnl From Jim Meyering. +-dnl FIXME: migrate into libit. +- +-AC_DEFUN(AM_FUNC_OBSTACK, +-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, +- [AC_TRY_LINK([#include "obstack.h"], +- [struct obstack *mem;obstack_free(mem,(char *) 0)], +- am_cv_func_obstack=yes, +- am_cv_func_obstack=no)]) +- if test $am_cv_func_obstack = yes; then +- AC_DEFINE(HAVE_OBSTACK) +- else +- LIBOBJS="$LIBOBJS obstack.o" +- fi +-]) +- +-dnl From Jim Meyering. Use this if you use the GNU error.[ch]. +-dnl FIXME: Migrate into libit +- +-AC_DEFUN(AM_FUNC_ERROR_AT_LINE, +-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, +- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], +- am_cv_lib_error_at_line=yes, +- am_cv_lib_error_at_line=no)]) +- if test $am_cv_lib_error_at_line = no; then +- LIBOBJS="$LIBOBJS error.o" +- fi +- AC_SUBST(LIBOBJS)dnl +-]) +- +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995. +- +-# serial 1 +-# Stephan Kulow: I put a KDE in it to avoid name conflicts +- +-AC_DEFUN(AM_KDE_GNU_GETTEXT, +- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl +- AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_ISC_POSIX])dnl +- AC_REQUIRE([AC_PROG_RANLIB])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- AC_REQUIRE([AC_C_INLINE])dnl +- AC_REQUIRE([AC_TYPE_OFF_T])dnl +- AC_REQUIRE([AC_TYPE_SIZE_T])dnl +- AC_REQUIRE([AC_FUNC_ALLOCA])dnl +- AC_REQUIRE([AC_FUNC_MMAP])dnl +- AC_REQUIRE([AM_KDE_WITH_NLS])dnl +- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +-unistd.h values.h alloca.h]) +- AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +-__argz_count __argz_stringify __argz_next stpcpy]) +- +- AM_LC_MESSAGES +- +- if test "x$CATOBJEXT" != "x"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for lang in ${LINGUAS=$ALL_LINGUAS}; do +- case "$ALL_LINGUAS" in +- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; +- esac +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi +- +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi +- +- ]) +- +-AC_DEFUN(AC_HAVE_XPM, +- [AC_REQUIRE_CPP()dnl +- +- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= +- test -z "$XPM_INCLUDE" && XPM_INCLUDE= +- +- AC_ARG_WITH(xpm, [ --without-xpm disable color pixmap XPM tests], +- xpm_test=$withval, xpm_test="yes") +- if test "x$xpm_test" = xno; then +- ac_cv_have_xpm=no +- else +- AC_MSG_CHECKING(for XPM) +- AC_CACHE_VAL(ac_cv_have_xpm, +- [ +- AC_LANG_C +- ac_save_ldflags=$LDFLAGS +- ac_save_cflags=$CFLAGS +- LDFLAGS="$LDFLAGS $XPM_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lXpm -lX11 -lXext" +- CFLAGS="$CFLAGS $X_INCLUDES" +- test ! -z "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" +- AC_TRY_LINK([#include ],[], +- ac_cv_have_xpm="yes",ac_cv_have_xpm="no") +- LDFLAGS=$ac_save_ldflags +- CFLAGS=$ac_save_cflags +- ])dnl +- +- if test "$ac_cv_have_xpm" = no; then +- AC_MSG_RESULT(no) +- XPM_LDFLAGS="" +- XPMINC="" +- $2 +- else +- AC_DEFINE(HAVE_XPM) +- if test "$XPM_LDFLAGS" = ""; then +- XPMLIB="-lXpm" +- else +- XPMLIB="-L$XPM_LDFLAGS -lXpm" +- fi +- if test "$XPM_INCLUDE" = ""; then +- XPMINC="" +- else +- XPMINC="-I$XPM_INCLUDE" +- fi +- AC_MSG_RESULT(yes) +- $1 +- fi +- fi +- AC_SUBST(XPMINC) +- AC_SUBST(XPMLIB) +-]) +- +-AC_DEFUN(AC_HAVE_GL, +- [AC_REQUIRE_CPP()dnl +- +- test -z "$GL_LDFLAGS" && GL_LDFLAGS= +- test -z "$GL_INCLUDE" && GL_INCLUDE= +- +- AC_ARG_WITH(gl, [ --without-gl disable 3D GL modes], +- gl_test=$withval, gl_test="yes") +- if test "x$gl_test" = xno; then +- ac_cv_have_gl=no +- else +- AC_MSG_CHECKING(for GL) +- AC_CACHE_VAL(ac_cv_have_gl, +- [ +- AC_LANG_C +- ac_save_ldflags=$LDFLAGS +- ac_save_cflags=$CFLAGS +- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lMesaGL -lMesaGLU -lX11 -lXext -lm" +- CFLAGS="$CFLAGS $X_INCLUDES" +- test ! -z "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" +- AC_TRY_LINK([],[], +- ac_cv_have_gl="yes",ac_cv_have_gl="no") +- LDFLAGS=$ac_save_ldflags +- CFLAGS=$ac_save_cflags +- ])dnl +- +- if test "$ac_cv_have_gl" = no; then +- AC_MSG_RESULT(no) +- GL_LDFLAGS="" +- GLINC="" +- $2 +- else +- AC_DEFINE(HAVE_GL) +- if test "$GL_LDFLAGS" = ""; then +- GLLIB="-lMesaGL -lMesaGLU" +- else +- GLLIB="-L$GL_LDFLAGS -lMesaGL -lMesaGLU" +- fi +- if test "$GL_INCLUDE" = ""; then +- GLINC="" +- else +- GLINC="-I$GL_INCLUDE" +- fi +- AC_MSG_RESULT(yes) +- $1 +- fi +- fi +- AC_SUBST(GLINC) +- AC_SUBST(GLLIB) +-]) + + dnl PAM pam + + dnl Should test for PAM (Pluggable Authentication Modules) +- AC_DEFUN(AC_PATH_PAM_DIRECT, ++ AC_DEFUN([AC_PATH_PAM_DIRECT], + [test -z "$pam_direct_test_library" && pam_direct_test_library=pam + test -z "$pam_direct_test_library" && pam_direct_test_library=pam_misc + test -z "$pam_direct_test_library" && pam_direct_test_library=dl +@@ -907,7 +596,7 @@ + LIBS="$ac_save_LIBS" + ]) + +-AC_DEFUN(AC_PATH_PAM, ++AC_DEFUN([AC_PATH_PAM], + [AC_REQUIRE_CPP()dnl + + pam_includes=NONE +@@ -959,162 +648,3 @@ + AC_SUBST(PAMLIBPATHS) + + ]) +- +- +-# Search path for a program which passes the given test. +-# Ulrich Drepper , 1996. +- +-# serial 1 +- +-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN(AM_PATH_PROG_WITH_TEST, +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test -n "[$]$1"; then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl +-]) +- +-# Do all the work for Automake. This macro actually does too much -- +-# some checks are only needed if your package does certain things. +-# But this isn't really a big deal. +- +-# serial 1 +- +-dnl Usage: +-dnl AM_INIT_AUTOMAKE(package,version, [no-define]) +- +-AC_DEFUN(AM_INIT_AUTOMAKE, +-[AC_REQUIRE([AM_PROG_INSTALL]) +-PACKAGE=[$1] +-AC_SUBST(PACKAGE) +-VERSION=[$2] +-AC_SUBST(VERSION) +-dnl test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi +-ifelse([$3],, +-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) +-AM_SANITY_CHECK +-AC_ARG_PROGRAM +-dnl FIXME This is truly gross. +-missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +-AC_PROG_MAKE_SET]) +- +- +-# serial 1 +- +-AC_DEFUN(AM_PROG_INSTALL, +-[AC_REQUIRE([AC_PROG_INSTALL]) +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +-AC_SUBST(INSTALL_SCRIPT)dnl +-]) +- +-# +-# Check to make sure that the build environment is sane. +-# +- +-AC_DEFUN(AM_SANITY_CHECK, +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftestfile +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` +- if test "[$]*" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftestfile` +- fi +- test "[$]2" = conftestfile +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-rm -f conftest* +-AC_MSG_RESULT(yes)]) +- +-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +-dnl The program must properly implement --version. +-AC_DEFUN(AM_MISSING_PROG, +-[AC_MSG_CHECKING(for working $2) +-# Run test in a subshell; some versions of sh will print an error if +-# an executable is not found, even if stderr is redirected. +-# Redirect stdin to placate older versions of autoconf. Sigh. +-if ($2 --version) < /dev/null > /dev/null 2>&1; then +- $1=$2 +- AC_MSG_RESULT(found) +-else +- $1="$3/missing $2" +- AC_MSG_RESULT(missing) +-fi +-AC_SUBST($1)]) +- +-# Like AC_CONFIG_HEADER, but automatically create stamp file. +- +-AC_DEFUN(AM_CONFIG_HEADER, +-[AC_PREREQ([2.12]) +-AC_CONFIG_HEADER([$1]) +-dnl When config.status generates a header, we must update the stamp-h file. +-dnl This file resides in the same directory as the config header +-dnl that is generated. We must strip everything past the first ":", +-dnl and everything past the last "/". +-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl +-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, +-<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, +-<>; do +- case " <<$>>CONFIG_HEADERS " in +- *" <<$>>am_file "*<<)>> +- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx +- ;; +- esac +- am_indx=`expr "<<$>>am_indx" + 1` +-done<<>>dnl>>) +-changequote([,]))]) +- +- +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac 2014-11-19 00:41:00.462734397 -0500 +@@ -3,12 +3,12 @@ + # I used much code from Janos Farkas + + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(acinclude.m4) dnl a source file from your sub dir, but acinclude.m4 does the job +-AC_CANONICAL_SYSTEM ++AC_INIT(kisdnlog, 0.1) ++AC_CONFIG_SRCDIR([acinclude.m4]) dnl a source file from your sub dir, but acinclude.m4 does the job ++AC_CANONICAL_TARGET + AC_ARG_PROGRAM + +-dnl You have to change this +-AM_INIT_AUTOMAKE(kisdnlog, 0.1) dnl searches for some needed programs ++AM_INIT_AUTOMAKE + + dnl make $KDEDIR the default for the installation + AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +@@ -26,15 +26,15 @@ + AC_PROG_LN_S + + dnl find out some variables +-AC_AIX +-AC_MINIX ++AC_USE_SYSTEM_EXTENSIONS ++AC_USE_SYSTEM_EXTENSIONS + + dnl for NLS support. Call them in this order! +-AC_LANG_CPLUSPLUS dnl switch to C++ ++AC_LANG([C++]) dnl switch to C++ + AM_KDE_WITH_NLS dnl check if nls is wanted + + dnl Checks for header files. +-AC_LANG_CPLUSPLUS dnl switch to C++ ++AC_LANG([C++]) dnl switch to C++ + AC_HEADER_DIRENT dnl check for dirent.h + AC_HEADER_STDC dnl check for other stdc headers. More traditional ;) + dnl check for some more header files. You can remove some of +@@ -61,8 +61,8 @@ + + dnl Checks for library functions. + AC_CHECK_FUNCS(socket vsnprintf) +-AC_CHECK_SETENV +-AC_LANG_CPLUSPLUS ++AC_CHECK_FUNC(setenv) ++AC_LANG([C++]) + AC_CHECK_FUNCS(getdomainname) + AC_CHECK_KSIZE_T + +@@ -74,6 +74,7 @@ + AC_SUBST(topdir) + + dnl add here all your Makefiles +-AC_OUTPUT(Makefile \ ++AC_CONFIG_FILES([Makefile \ + pixmaps/Makefile \ +- src/Makefile) ++ src/Makefile]) ++AC_OUTPUT +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am 2014-11-19 00:41:00.462734397 -0500 +@@ -14,7 +14,7 @@ + # just set the variable + APPSDIR = $(kde_appsdir)/Utilities + # set the include path for X, qt and KDE +-INCLUDES= @all_includes@ ++AM_CPPFLAGS = @all_includes@ + # claim, which subdirectories you want to install + # SUBDIRS = doc + +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac 2014-11-19 00:41:00.462734397 -0500 +@@ -81,45 +81,34 @@ + dnl To make it possible to set variables in policy.h + dnl they have to be defined with AC_DEFINE... + dnl +-AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR") +-AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE") +-AC_DEFINE_UNQUOTED(DATADIR,"$datadir") +-AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT) +-AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE") +-AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE") +-AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE") +-AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD") +-AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD") +-AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD") ++AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR",[Define the old config directory]) ++AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE",[Define the name of the old config file]) ++AC_DEFINE_UNQUOTED(DATADIR,"$DATADIR",[Define the data directory]) ++AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT,[Define to use a port other than 20011 by default]) ++AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE",[File for permission configuration]) ++AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE",[Logfile]) ++AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE",[Charge file]) ++AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD",[Command for reloading]) ++AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD",[Command for stopping]) ++AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD",[Command for rebooting]) ++CHARGECOUNTRY=DE + if test "$CONFIG_ISDN_LOG_DE" = "y" ; then +- NATION="de" +- NATION_MACRO="ISDN_DE" +- AC_DEFINE(ISDN_DE) ++ CHARGECOUNTRY=DE + fi + if test "$CONFIG_ISDN_LOG_AT" = "y" ; then +- NATION="at" +- NATION_MACRO="ISDN_AT" +- AC_DEFINE(ISDN_AT) ++ CHARGECOUNTRY=AT + fi + if test "$CONFIG_ISDN_LOG_CH" = "y" ; then +- NATION="ch" +- NATION_MACRO="ISDN_CH" +- AC_DEFINE(ISDN_CH) ++ CHARGECOUNTRY=CH + fi + if test "$CONFIG_ISDN_LOG_NL" = "y" ; then +- NATION="nl" +- NATION_MACRO="ISDN_NL" +- AC_DEFINE(ISDN_NL) ++ CHARGECOUNTRY=NL + fi + if test "$CONFIG_ISDN_LOG_LU" = "y" ; then +- NATION="lu" +- NATION_MACRO="ISDN_LU" +- AC_DEFINE(ISDN_LU) ++ CHARGECOUNTRY=LU + fi + if test "$CONFIG_ISDN_LOG_XX" = "y" ; then +- NATION=$CONFIG_ISDN_LOG_CC +- NATION_MACRO="ISDN_XX" +- AC_DEFINE(ISDN_XX) ++ CHARGECOUNTRY=XX + fi + + dnl Checks for programs. +@@ -132,17 +121,17 @@ + + dnl Checks for libraries. + if test -e tools/cdb/i4l_cdb.c ; then +- AC_DEFINE(USE_CDB) ++ AC_DEFINE(USE_CDB,1,[Use CDB instead pf g?dbm? rename tools/cdb/i4l_cdb.c, if you want to use gdbm]) + CDBEXTRALIBS="tools/cdb/i4l_cdb.a" + DBEXT=".cdb" + RDBEXT=".cdb" + AC_MSG_RESULT(Using 'cdb' as database) + else +-AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM), +- [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM), +- [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])]) ++AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM,1,[Define if you have the gdbm library (-lgdbm).]), ++ [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM,1,[Define if you have the dbm library (-ldbm).]), ++ [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB,1,[Define if you have the db library (-ldb).]))])]) + fi +-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") ++AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[File extension for the relational data base]) + + dnl log database support + AC_CHECK_POSTGRES +@@ -160,7 +149,7 @@ + dnl Manual config + AC_ARG_WITH(isdnlib, + [ --with-isdnlib=DIR Set isdn library [../lib]], +- LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval")) ++ LIBISDNDIR=$withval) + AC_ARG_WITH(area-lib, + [ --with-area-lib=STRING Set area library type [area]], + ALIB=$withval) +@@ -198,28 +187,38 @@ + + if test "$ALIB" = "area" ; then + LIBAREA=1 +- AC_DEFINE(LIBAREA) ++ AC_DEFINE(LIBAREA,1,[Define to 1 if libarea should be used]) + fi + case "$CHARGECOUNTRY" in + DE) + NATION="de" + NATION_MACRO="ISDN_DE" +- AC_DEFINE(ISDN_DE) ++ AC_DEFINE(ISDN_DE,1,[Define to 1 if you have German charge info]) + ;; + AT) + NATION="at" + NATION_MACRO="ISDN_AT" +- AC_DEFINE(ISDN_AT) ++ AC_DEFINE(ISDN_AT,1,[Define to 1 if you have Austrian charge info]) + ;; + CH) + NATION="ch" + NATION_MACRO="ISDN_CH" +- AC_DEFINE(ISDN_CH) ++ AC_DEFINE(ISDN_CH,1,[Define to 1 if you have Swiss charge info]) + ;; + NL) + NATION="nl" + NATION_MACRO="ISDN_NL" +- AC_DEFINE(ISDN_NL) ++ AC_DEFINE(ISDN_NL,1,[Define to 1 if you have Netherlands charge info]) ++ ;; ++ LU) ++ NATION="lu" ++ NATION_MACRO="ISDN_LU" ++ AC_DEFINE(ISDN_LU,1,[Define to 1 if you have Luxembourg charge info]) ++ ;; ++ *) ++ NATION=$CONFIG_ISDN_LOG_CC ++ NATION_MACRO="ISDN_XX" ++ AC_DEFINE(ISDN_XX,1,[Define to 1 if you have a charge info for a different country]) + ;; + esac + +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac 2014-11-19 00:41:00.462734397 -0500 +@@ -1,8 +1,13 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(mkzonedb.c) +-AC_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_PREFIX_DEFAULT(/usr) + ++AH_TEMPLATE(USE_CDB, [Whether or not to use our cdb]) ++AH_TEMPLATE(HAVE_LIBGDBM, [Whether or not we have the GNU DataBase Manager library]) ++AH_TEMPLATE(HAVE_LIBDBM, [Whether or not we have the (generic) DataBase Manager library]) ++AH_TEMPLATE(HAVE_LIBDB, [Whether or not we have the DataBase library]) ++ + CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}` + CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}` + +@@ -29,7 +34,7 @@ + [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB), + [AC_MSG_ERROR([No db found])])])]) + fi +-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") ++AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT", [The relational database file extension]) + + dnl Checks for header files. + AC_HEADER_STDC +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am 2014-11-19 00:41:00.462734397 -0500 +@@ -7,9 +7,9 @@ + MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ + stamp-h.in comperr + +-INCLUDES = $(all_includes) ++AM_CPPFLAGS = -I../capi20 $(all_includes) + CFLAGS = -Wall -O2 +-LDFLAGS = $(all_libraries) ++LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) + LDADD = -lcapi20 + + sbin_PROGRAMS = rcapid +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac 2014-11-19 00:41:00.462734397 -0500 +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(rcapid.c) +-AM_INIT_AUTOMAKE(rcapid, 1.2) ++AC_INIT(rcapid, 1.2) ++AC_CONFIG_SRCDIR(rcapid.c) ++AM_INIT_AUTOMAKE + AC_PREFIX_DEFAULT(/usr) + + CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 +--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 2014-11-19 00:41:00.462734397 -0500 +@@ -1,5 +1,5 @@ + +-AC_DEFUN(AC_FIND_FILE, ++AC_DEFUN([AC_FIND_FILE], + [ + $3=NO + for i in $2; +@@ -15,7 +15,7 @@ + done + ]) + +-AC_DEFUN(AC_PATH_PKGLOGDIR, ++AC_DEFUN([AC_PATH_PKGLOGDIR], + [ + packagelogdir="`eval echo ${packagelogdir:-/var/log}`" + +@@ -26,7 +26,7 @@ + AC_SUBST(packagelogdir) + ]) + +-AC_DEFUN(AC_PATH_PKGLOCKDIR, ++AC_DEFUN([AC_PATH_PKGLOCKDIR], + [ + packagelockdir="`eval echo ${packagelockdir:-/var/lock}`" + +@@ -37,7 +37,7 @@ + AC_SUBST(packagelockdir) + ]) + +-AC_DEFUN(AC_PATH_PKGPIDDIR, ++AC_DEFUN([AC_PATH_PKGPIDDIR], + [ + packagepiddir="`eval echo ${packagepiddir:-/var/run}`" + +@@ -48,7 +48,7 @@ + AC_SUBST(packagepiddir) + ]) + +-AC_DEFUN(AC_PATH_TCL, ++AC_DEFUN([AC_PATH_TCL], + [ + ac_tcl_inc="" + ac_tcl_lib="" +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac +--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac 2014-11-19 00:41:00.462734397 -0500 +@@ -3,12 +3,13 @@ + + ## init ################################################################### + +-AC_INIT(acinclude.m4) ++AC_INIT(vbox, 3.0B1) ++AC_CONFIG_SRCDIR([acinclude.m4]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET + AC_ARG_PROGRAM + +-AM_INIT_AUTOMAKE(vbox, 3.0B1) ++AM_INIT_AUTOMAKE + + AC_PREFIX_DEFAULT(/opt/vbox) + +@@ -17,11 +18,11 @@ + ## programs ############################################################### + + AC_PROG_CC +-AC_PROG_CC_WORKS +-AC_PROG_CC_GNU ++#AC_PROG_CC_WORKS ++#AC_PROG_CC_GNU + + AC_PROG_RANLIB +-AM_PROG_INSTALL ++AC_PROG_INSTALL + + ## libraries ############################################################## + +@@ -54,9 +55,9 @@ + + ## output ################################################################# + +-AC_OUTPUT(Makefile \ ++AC_CONFIG_FILES([Makefile \ + vboxgetty/Makefile \ + vboxgetty/docs/Makefile \ +- vboxgetty/docs/de/Makefile \ + vboxgetty/examples/Makefile \ +- vboxgetty/examples/scripts/Makefile) ++ vboxgetty/examples/scripts/Makefile]) ++AC_OUTPUT +diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am +--- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am 2012-07-06 02:27:19.000000000 -0400 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am 2014-11-19 00:41:00.462734397 -0500 +@@ -14,7 +14,7 @@ + + DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' + +-INCLUDES = $(all_includes) $(tcl_include) ++AM_CPPFLAGS = $(all_includes) $(tcl_include) + + noinst_LIBRARIES = libvboxmodem.a + diff --git a/libre/non-working/isdnutils-dfsg/PKGBUILD b/libre/non-working/isdnutils-dfsg/PKGBUILD deleted file mode 100644 index 1ff0b451a..000000000 --- a/libre/non-working/isdnutils-dfsg/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# Maintainer: Luke Shumaker - -# Debian information -_debname=isdnutils -_debver=3.25+dfsg1 -_debrel=3.5 -_debrepo=http://ftp.debian.org/debian/pool/main - -pkgname=${_debname}-dfsg -pkgver=${_debver/+dfsg/.}.${_debrel} -pkgdesc="Debian's user space administration programs and tools for ISDN" -url="http://packages.debian.org/source/sid/isdnutils" -license=( - 'GPL2' 'LGPL2' # most everything - 'custom' # Mini-FAQ - 'ZLIB' # areacode - 'BSD4' 'BSD4-modified' 'BSD3' 'BSD2' 'MIT' # ipppd - 'X11' # xisdnload -) - -_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } -source=($(_debfile ${_debname}_${_debver}-${_debrel}.dsc) - $(_debfile ${_debname}_${_debver}.orig.tar.bz2) - $(_debfile ${_debname}_${_debver}-${_debrel}.debian.tar.xz) - modern-autoconf.patch -) -noextract=("${source[@]##*/}") -md5sums=('19d43212c307d30db9dad2413e84374b' - '38841f0c697d49fd71ff91e9188f6d4c' - '68b901c1553771bcef9a9297a93c4a46' - '9fa4158b19d5c9b774d14af34767ef1b') - -# Package meta-data -pkgrel=1 -arch=(i686 x86_64) -depends=(sh) -makedepends=(imake dpkg-devtools linuxdoc-tools zip linux-api-headers) -optdepends=( - "ncurses: for imon and vbox" - "tcl: for vbox" -) -makedepends+=("${optdepends[@]%%:*}") - -# isdnutils-dpkg replaces isdn4k-utils(Arch) replaces capi4k-utils(Arch) -replaces=('isdn4k-utils' 'capi4k-utils') -provides=("isdn4k-utils=$pkgver") - -#### - -# Use `make -j1` because the cappiinfo subdir depends on capi20, and -# automake has no way of expressing this. -prepare() { - cd "$srcdir" - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc $pkgname-$pkgver - cd "$srcdir"/$pkgname-$pkgver - - find . -name configure.in -execdir mv {} configure.ac \; - patch -p1 -i ../modern-autoconf.patch - ( - set -o pipefail - find * -name configure.ac -printf '%h\n' | - while read -r dir; do - echo "Running \`autoreconf -if' in \`$dir'..." - pushd "$dir" >/dev/null - autoreconf -if |& sed 's,^, ,' - popd >/dev/null - done - ) - - sed \ - -e "s#@KERNELDIR@#/usr/include/linux#" \ - -e "s#@LIBDIR@#/usr/lib#" \ - debian/dotconfig > .config -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - - make -j1 subconfig - make -j1 - make -j1 -C isdnlog/tools/zone zonefiles - make -j1 -C Mini-FAQ -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - - mkdir -p "$pkgdir"/usr/bin - ln -s bin "$pkgdir"/usr/sbin - ln -s usr/bin "$pkgdir"/bin - ln -s usr/bin "$pkgdir"/sbin - - make -j1 install DESTDIR="$pkgdir" - install -Dm644 debian/copyright "$pkgdir"/usr/share/licenses/$pkgname/copyright - - rm "$pkgdir"/{bin,sbin,usr/sbin} - - # The following is adapted debian/rules:override_dh_auto_install - mv "$pkgdir"/usr/share/man/man5/vbox{_file,}.5 - install -Dm0644 vbox/examples/vboxrc.example "$pkgdir"/usr/share/doc/isdnvboxclient/examples/vboxrc -} diff --git a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch b/libre/non-working/isdnutils-dfsg/modern-autoconf.patch deleted file mode 100644 index f80f34f54..000000000 --- a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch +++ /dev/null @@ -1,1313 +0,0 @@ -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/Makefile isdnutils-dfsg-3.25.1.3.5/Makefile ---- isdnutils-dfsg-3.25.1.3.5.orig/Makefile 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/Makefile 2014-11-19 00:41:00.452734610 -0500 -@@ -53,10 +53,10 @@ - endif - - ifeq ($(CONFIG_RCAPID),y) -- SUBDIRS := $(SUBDIRS) capiinfo -+ SUBDIRS := $(SUBDIRS) capi20 capiinfo - else - ifeq ($(CONFIG_AVMCAPICTRL),y) -- SUBDIRS := $(SUBDIRS) capiinfo -+ SUBDIRS := $(SUBDIRS) capi20 capiinfo - endif - endif - -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac 2014-11-19 00:41:00.452734610 -0500 -@@ -1,7 +1,10 @@ - dnl Process this file with autoconf to produce a configure script. - - AC_PREREQ(2.50) --AC_INIT(capi20.c) -+AC_INIT(libcapi20, ${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE}) -+AC_CONFIG_SRCDIR(capi20.c) -+AM_INIT_AUTOMAKE -+ - AC_ARG_ENABLE([V2], - AS_HELP_STRING([--enable-V2],[build libcapi20 version 2 compatible library]), - [case "${enableval}" in -@@ -22,7 +25,6 @@ - LIBCAPI_VERSION_RELEASE=6 - ]) - --AM_INIT_AUTOMAKE(libcapi20,${LIBCAPI_VERSION}.${LIBCAPI_VERSION_RELEASE}) - AC_PREFIX_DEFAULT(/usr) - AC_SUBST(BUILD) - -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am 2014-11-19 00:42:07.217978987 -0500 -@@ -7,9 +7,9 @@ - MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ - stamp-h.in - --INCLUDES = $(all_includes) -+AM_CPPFLAGS = -I../capi20 $(all_includes) - CFLAGS = -Wall -O2 --LDFLAGS = $(all_libraries) -+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - - bin_PROGRAMS = capifax capifaxrcvd -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac 2014-11-19 00:41:00.456067872 -0500 -@@ -1,6 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(capifax.c) --AM_INIT_AUTOMAKE(capifax, 1.0) -+AC_INIT(capifax, 1.0) -+AC_CONFIG_SRCDIR(capifax.c) -+AM_INIT_AUTOMAKE - AC_PREFIX_DEFAULT(/usr) - - CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am 2014-11-19 00:41:00.456067872 -0500 -@@ -7,9 +7,9 @@ - MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ - stamp-h.in comperr - --INCLUDES = $(all_includes) -+AM_CPPFLAGS = -I../capi20 $(all_includes) - CFLAGS = -Wall -O2 --LDFLAGS = $(all_libraries) -+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - - bin_PROGRAMS = capiinfo -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac 2014-11-19 00:41:00.456067872 -0500 -@@ -1,6 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(capiinfo.c) --AM_INIT_AUTOMAKE(capiinfo, 1.0) -+AC_INIT(capiinfo, 1.0) -+AC_CONFIG_SRCDIR(capiinfo.c) -+AM_INIT_AUTOMAKE - AC_PREFIX_DEFAULT(/usr) - - I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am 2014-11-19 00:41:00.456067872 -0500 -@@ -7,7 +7,7 @@ - MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ - stamp-h.in comperr core - --INCLUDES = $(all_includes) -+AM_CPPFLAGS = $(all_includes) - CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g - LDFLAGS = $(all_libraries) - LDADD = -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac 2014-11-19 00:41:00.456067872 -0500 -@@ -1,6 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(capiinit.c) --AM_INIT_AUTOMAKE(capiinit, 1.0) -+AC_INIT(capiinit, 1.0) -+AC_CONFIG_SRCDIR(capiinit.c) -+AM_INIT_AUTOMAKE - AC_PREFIX_DEFAULT(/) - - CONFIG_SBINDIR$=${CONFIG_CARD_SBINDIR:-"/sbin"} -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac isdnutils-dfsg-3.25.1.3.5/imon/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/imon/configure.ac 2014-11-19 00:41:00.459401135 -0500 -@@ -4,8 +4,8 @@ - AC_PREFIX_DEFAULT(/usr) - - I4LVERSION=${I4LVERSION:-"?.?"} --CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}` --CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}` -+CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} -+CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} - MANDATE=`grep CHECKIN imon.man.in | awk '{print $4}'` - - dnl Checks for programs. -@@ -38,14 +38,14 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}", [imon 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}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}", [imon manual directory]), - ) - - AC_SUBST(INSTALL) -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac 2014-11-19 00:41:00.459401135 -0500 -@@ -30,21 +30,21 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[isdnctrl 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}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[isdn manual directory]), - ) - - dnl Optional config-file-option - AC_ARG_ENABLE(cfile, - [ --enable-cfile Enable configfile option [no]], - CONFIG_ISDNCTRL_CONF=y -- AC_DEFINE(CONFIG_ISDNCTRL_CONF,y), -+ AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable isdnctrl config file]), - ) - - AC_SUBST(INSTALL) -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 2014-11-19 00:41:00.459401135 -0500 -@@ -2,7 +2,7 @@ - dnl Check for postgres - dnl - --AC_DEFUN(AC_CHECK_POSTGRES, [ -+AC_DEFUN([AC_CHECK_POSTGRES], [ - POSTGRESDIR="" - pqdir="no" - tst_postgresdir="$CONFIG_ISDNLOG_POSTGRESDIR" -@@ -45,13 +45,13 @@ - if test "$pqdir" != "no" ; then - AC_MSG_RESULT("yes") - POSTGRES=1 -- AC_DEFINE_UNQUOTED(POSTGRES,1) -+ AC_DEFINE_UNQUOTED(POSTGRES,1,[Define to 1 if postgres should be used]) - else - AC_MSG_RESULT("no POSTGRES DISABLED") - pqdir="" - fi - POSTGRESDIR="$pqdir" -- AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir") -+ AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[Define to the prefix that postgres was installed to.]) - AC_SUBST(POSTGRES) - AC_SUBST(POSTGRESDIR) - ]) -@@ -59,7 +59,7 @@ - dnl Check for mysql - dnl - --AC_DEFUN(AC_CHECK_MYSQLDB, [ -+AC_DEFUN([AC_CHECK_MYSQLDB], [ - MYSQLDIR="" - mydir="no" - tst_mysqldir="$CONFIG_ISDNLOG_MYSQLDIR" -@@ -108,13 +108,13 @@ - if test "$mydir" != "no" ; then - AC_MSG_RESULT("yes") - MYSQLDB=1 -- AC_DEFINE_UNQUOTED(MYSQLDB,1) -+ AC_DEFINE_UNQUOTED(MYSQLDB,1,[Define to 1 if mysql should be used]) - else - AC_MSG_RESULT("no MYSQL DISABLED") - mydir="" - fi - MYSQLDIR="$mydir" -- AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir") -+ AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[Define to the prefix that postgres was installed to.]) - AC_SUBST(MYSQLDB) - AC_SUBST(MYSQLDIR) - ]) -@@ -123,7 +123,7 @@ - dnl Check for Oracle - dnl - --AC_DEFUN(AC_CHECK_ORACLE, [ -+AC_DEFUN([AC_CHECK_ORACLE], [ - oradir="no" - if test "$ORACLE_HOME" != "" && test "$CONFIG_ISDNLOG_ORACLE" = "y" ; then - AC_MSG_CHECKING([for Oracle in ${ORACLE_HOME}]) -@@ -134,7 +134,7 @@ - if test "$oradir" != "no" ; then - AC_MSG_RESULT("yes") - ORACLE=1 -- AC_DEFINE_UNQUOTED(ORACLE,1) -+ AC_DEFINE_UNQUOTED(ORACLE,1,[Define to 1 if oracle should b used]) - else - AC_MSG_RESULT("no ORACLE DISABLED") - fi -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 2014-11-19 00:41:00.459401135 -0500 -@@ -15,7 +15,7 @@ - dnl PARTICULAR PURPOSE. - - --AC_DEFUN(AC_FIND_FILE, -+AC_DEFUN([AC_FIND_FILE], - [ - $3=NO - for i in $2; -@@ -30,7 +30,7 @@ - done - ]) - --AC_DEFUN(AC_PATH_QT_DIRECT, -+AC_DEFUN([AC_PATH_QT_DIRECT], - [if test "$ac_qt_includes" = NO; then - AC_TRY_CPP([#include ], - [ -@@ -40,14 +40,14 @@ - fi - ]) - --AC_DEFUN(AC_PATH_QT_MOC, -+AC_DEFUN([AC_PATH_QT_MOC], - [ - AC_PATH_PROG(MOC, moc, /usr/bin/moc, - $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin) - ]) - - --AC_DEFUN(AC_CREATE_KFSSTND, -+AC_DEFUN([AC_CREATE_KFSSTND], - [ - - kde_htmldir="\$(prefix)/share/doc/HTML" -@@ -75,59 +75,9 @@ - - ]) - --AC_DEFUN(K_PATH_X, -+AC_DEFUN([AC_PATH_QT_1_3], - [ --AC_MSG_CHECKING(for X) --AC_CACHE_VAL(ac_cv_have_x, --[# One or both of the vars are not set, and there is no cached value. --ac_x_includes=NO ac_x_libraries=NO --AC_PATH_X_DIRECT --AC_PATH_X_XMKMF --if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then -- AC_MSG_ERROR([Can't find X. Please add the correct paths. View configure --help for usage!]) --else -- # Record where we found X for the cache. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" --fi])dnl --eval "$ac_cv_have_x" -- --if test "$have_x" != yes; then -- AC_MSG_RESULT($have_x) -- no_x=yes --else -- # If each of the values was on the command line, it overrides each guess. -- test "x$x_includes" = xNONE && x_includes=$ac_x_includes -- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -- # Update the cache value to reflect the command line values. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -- AC_MSG_RESULT([libraries $x_libraries, headers $x_includes]) --fi -- --if test -z "$x_includes" || test "x$x_includes" = xNONE; then -- X_INCLUDES="" -- x_includes="."; dnl better than nothing :- -- else -- X_INCLUDES="-I$x_includes" --fi -- --if test -z "$x_libraries" || test "$x_libraries" = xNONE; then -- X_LDFLAGS="" -- x_libraries="/usr/lib"; dnl better than nothing :- -- all_libraries="" -- else -- X_LDFLAGS="-L$x_libraries" -- all_libraries=$X_LDFLAGS --fi -- --AC_SUBST(X_INCLUDES) --AC_SUBST(X_LDFLAGS) --all_includes=$X_INCLUDES --]) --AC_DEFUN(AC_PATH_QT_1_3, --[ --AC_REQUIRE([K_PATH_X]) -+AC_REQUIRE([AC_PATH_X]) - - AC_MSG_CHECKING([for QT-1.30]) - ac_qt_includes=NO ac_qt_libraries=NO -@@ -256,12 +206,12 @@ - AC_PATH_QT_MOC - ]) - --AC_DEFUN(AC_PATH_QT, -+AC_DEFUN([AC_PATH_QT], - [ - AC_PATH_QT_1_3 - ]) - --AC_DEFUN(AC_PATH_KDE, -+AC_DEFUN([AC_PATH_KDE], - [ - AC_REQUIRE([AC_PATH_QT])dnl - AC_MSG_CHECKING([for KDE]) -@@ -340,43 +290,7 @@ - AC_CREATE_KFSSTND - ]) - --dnl slightly changed version of AC_CHECK_FUNC(setenv) --AC_DEFUN(AC_CHECK_SETENV, --[AC_MSG_CHECKING([for setenv]) --AC_CACHE_VAL(ac_cv_func_setenv, --[AC_LANG_C --AC_TRY_LINK( --dnl Don't include because on OSF/1 3.0 it includes --dnl which includes which contains a prototype for --dnl select. Similarly for bzero. --[#include --]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus --extern "C" --#endif --])dnl --[/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --#include --], [ --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$1) || defined (__stub___$1) --choke me --#else --setenv("TEST", "alle", 1); --#endif --], eval "ac_cv_func_setenv=yes", eval "ac_cv_func_setenv=no")]) -- --if test "$ac_cv_func_setenv" = "yes"; then -- AC_MSG_RESULT(yes) -- AC_DEFINE_UNQUOTED(HAVE_FUNC_SETENV) --else -- AC_MSG_RESULT(no) --fi --]) -- --AC_DEFUN(AC_FIND_GIF, -+AC_DEFUN([AC_FIND_GIF], - [AC_MSG_CHECKING(for giflib) - AC_CACHE_VAL(ac_cv_lib_gif, - [ac_save_LIBS="$LIBS" -@@ -407,7 +321,7 @@ - fi - ]) - --AC_DEFUN(AC_FIND_JPEG, -+AC_DEFUN([AC_FIND_JPEG], - [AC_MSG_CHECKING(for jpeglib) - AC_CACHE_VAL(ac_cv_lib_jpeg, - [ac_save_LIBS="$LIBS" -@@ -464,7 +378,7 @@ - fi - ]) - --AC_DEFUN(AC_CHECK_BOOL, -+AC_DEFUN([AC_CHECK_BOOL], - [ - AC_MSG_CHECKING(for bool) - AC_CACHE_VAL(ac_cv_have_bool, -@@ -481,7 +395,7 @@ - fi - ]) - --AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, -+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], - [ - AC_MSG_CHECKING(if you need GNU extensions) - cat > conftest.c << EOF -@@ -502,7 +416,7 @@ - fi - ]) - --AC_DEFUN(AC_CHECK_WITH_GCC, -+AC_DEFUN([AC_CHECK_WITH_GCC], - [ - AC_ARG_WITH(gcc-flags,[ --without-gcc-flags don't use gcc flags [default=no]]) - if test "x$with_gcc_flags" = "xno"; then -@@ -513,7 +427,7 @@ - ]) - - --AC_DEFUN(AC_SET_DEBUG, -+AC_DEFUN([AC_SET_DEBUG], - [ - if test "x$ac_use_gcc_flags" = "xyes"; then - test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG" -@@ -522,7 +436,7 @@ - fi - ]) - --AC_DEFUN(AC_SET_NODEBUG, -+AC_DEFUN([AC_SET_NODEBUG], - [ - if test "x$ac_use_gcc_flags" = "xyes"; then - test "$CFLAGS" = "" && CFLAGS="-O2 -Wall" -@@ -531,7 +445,7 @@ - fi - ]) - --AC_DEFUN(AC_CHECK_DEBUG, -+AC_DEFUN([AC_CHECK_DEBUG], - [ - AC_ARG_ENABLE(debug,[ --enable-debug creates debugging code [default=no]], - [ -@@ -544,7 +458,7 @@ - ]) - - dnl just a test --AC_DEFUN(AC_CHECK_FLAGS, -+AC_DEFUN([AC_CHECK_FLAGS], - [ - AC_REQUIRE([AC_CHECK_WITH_GCC]) - AC_REQUIRE([AC_CHECK_DEBUG]) -@@ -554,7 +468,7 @@ - ]) - - dnl Check for the type of the third argument of getsockname --AC_DEFUN(AC_CHECK_KSIZE_T, -+AC_DEFUN([AC_CHECK_KSIZE_T], - [AC_MSG_CHECKING(for the third argument of getsockname) - AC_CACHE_VAL(ac_cv_ksize_t_int, - [AC_TRY_COMPILE([#include -@@ -573,7 +487,7 @@ - - dnl This is a merge of some macros out of the gettext aclocal.m4 - dnl since we don't need anything, I took the things we need --AC_DEFUN(AM_KDE_WITH_NLS, -+AC_DEFUN([AM_KDE_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, -@@ -586,10 +500,10 @@ - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) - -- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt, -+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext, -+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - -@@ -610,57 +524,12 @@ - - ]) - --# Search path for a program which passes the given test. --# Ulrich Drepper , 1996. -- --# serial 1 --# Stephan Kulow: I appended a _KDE against name conflicts -- --dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AM_PATH_PROG_WITH_TEST_KDE, --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test -n "[$]$1"; then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -- -- - # Check whether LC_MESSAGES is available in . - # Ulrich Drepper , 1995. - - # serial 1 - --AC_DEFUN(AM_LC_MESSAGES, -+AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], -@@ -669,191 +538,11 @@ - AC_DEFINE(HAVE_LC_MESSAGES) - fi - fi]) -- --dnl From Jim Meyering. --dnl FIXME: migrate into libit. -- --AC_DEFUN(AM_FUNC_OBSTACK, --[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, -- [AC_TRY_LINK([#include "obstack.h"], -- [struct obstack *mem;obstack_free(mem,(char *) 0)], -- am_cv_func_obstack=yes, -- am_cv_func_obstack=no)]) -- if test $am_cv_func_obstack = yes; then -- AC_DEFINE(HAVE_OBSTACK) -- else -- LIBOBJS="$LIBOBJS obstack.o" -- fi --]) -- --dnl From Jim Meyering. Use this if you use the GNU error.[ch]. --dnl FIXME: Migrate into libit -- --AC_DEFUN(AM_FUNC_ERROR_AT_LINE, --[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, -- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], -- am_cv_lib_error_at_line=yes, -- am_cv_lib_error_at_line=no)]) -- if test $am_cv_lib_error_at_line = no; then -- LIBOBJS="$LIBOBJS error.o" -- fi -- AC_SUBST(LIBOBJS)dnl --]) -- --# Macro to add for using GNU gettext. --# Ulrich Drepper , 1995. -- --# serial 1 --# Stephan Kulow: I put a KDE in it to avoid name conflicts -- --AC_DEFUN(AM_KDE_GNU_GETTEXT, -- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl -- AC_REQUIRE([AC_PROG_CC])dnl -- AC_REQUIRE([AC_ISC_POSIX])dnl -- AC_REQUIRE([AC_PROG_RANLIB])dnl -- AC_REQUIRE([AC_HEADER_STDC])dnl -- AC_REQUIRE([AC_C_INLINE])dnl -- AC_REQUIRE([AC_TYPE_OFF_T])dnl -- AC_REQUIRE([AC_TYPE_SIZE_T])dnl -- AC_REQUIRE([AC_FUNC_ALLOCA])dnl -- AC_REQUIRE([AC_FUNC_MMAP])dnl -- AC_REQUIRE([AM_KDE_WITH_NLS])dnl -- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ --unistd.h values.h alloca.h]) -- AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ --__argz_count __argz_stringify __argz_next stpcpy]) -- -- AM_LC_MESSAGES -- -- if test "x$CATOBJEXT" != "x"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- AC_MSG_CHECKING(for catalogs to be installed) -- NEW_LINGUAS= -- for lang in ${LINGUAS=$ALL_LINGUAS}; do -- case "$ALL_LINGUAS" in -- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -- esac -- done -- LINGUAS=$NEW_LINGUAS -- AC_MSG_RESULT($LINGUAS) -- fi -- -- dnl Construct list of names of catalog files to be constructed. -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -- -- ]) -- --AC_DEFUN(AC_HAVE_XPM, -- [AC_REQUIRE_CPP()dnl -- -- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= -- test -z "$XPM_INCLUDE" && XPM_INCLUDE= -- -- AC_ARG_WITH(xpm, [ --without-xpm disable color pixmap XPM tests], -- xpm_test=$withval, xpm_test="yes") -- if test "x$xpm_test" = xno; then -- ac_cv_have_xpm=no -- else -- AC_MSG_CHECKING(for XPM) -- AC_CACHE_VAL(ac_cv_have_xpm, -- [ -- AC_LANG_C -- ac_save_ldflags=$LDFLAGS -- ac_save_cflags=$CFLAGS -- LDFLAGS="$LDFLAGS $XPM_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lXpm -lX11 -lXext" -- CFLAGS="$CFLAGS $X_INCLUDES" -- test ! -z "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS" -- AC_TRY_LINK([#include ],[], -- ac_cv_have_xpm="yes",ac_cv_have_xpm="no") -- LDFLAGS=$ac_save_ldflags -- CFLAGS=$ac_save_cflags -- ])dnl -- -- if test "$ac_cv_have_xpm" = no; then -- AC_MSG_RESULT(no) -- XPM_LDFLAGS="" -- XPMINC="" -- $2 -- else -- AC_DEFINE(HAVE_XPM) -- if test "$XPM_LDFLAGS" = ""; then -- XPMLIB="-lXpm" -- else -- XPMLIB="-L$XPM_LDFLAGS -lXpm" -- fi -- if test "$XPM_INCLUDE" = ""; then -- XPMINC="" -- else -- XPMINC="-I$XPM_INCLUDE" -- fi -- AC_MSG_RESULT(yes) -- $1 -- fi -- fi -- AC_SUBST(XPMINC) -- AC_SUBST(XPMLIB) --]) -- --AC_DEFUN(AC_HAVE_GL, -- [AC_REQUIRE_CPP()dnl -- -- test -z "$GL_LDFLAGS" && GL_LDFLAGS= -- test -z "$GL_INCLUDE" && GL_INCLUDE= -- -- AC_ARG_WITH(gl, [ --without-gl disable 3D GL modes], -- gl_test=$withval, gl_test="yes") -- if test "x$gl_test" = xno; then -- ac_cv_have_gl=no -- else -- AC_MSG_CHECKING(for GL) -- AC_CACHE_VAL(ac_cv_have_gl, -- [ -- AC_LANG_C -- ac_save_ldflags=$LDFLAGS -- ac_save_cflags=$CFLAGS -- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $QT_LDFLAGS -lMesaGL -lMesaGLU -lX11 -lXext -lm" -- CFLAGS="$CFLAGS $X_INCLUDES" -- test ! -z "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" -- AC_TRY_LINK([],[], -- ac_cv_have_gl="yes",ac_cv_have_gl="no") -- LDFLAGS=$ac_save_ldflags -- CFLAGS=$ac_save_cflags -- ])dnl -- -- if test "$ac_cv_have_gl" = no; then -- AC_MSG_RESULT(no) -- GL_LDFLAGS="" -- GLINC="" -- $2 -- else -- AC_DEFINE(HAVE_GL) -- if test "$GL_LDFLAGS" = ""; then -- GLLIB="-lMesaGL -lMesaGLU" -- else -- GLLIB="-L$GL_LDFLAGS -lMesaGL -lMesaGLU" -- fi -- if test "$GL_INCLUDE" = ""; then -- GLINC="" -- else -- GLINC="-I$GL_INCLUDE" -- fi -- AC_MSG_RESULT(yes) -- $1 -- fi -- fi -- AC_SUBST(GLINC) -- AC_SUBST(GLLIB) --]) - - dnl PAM pam - - dnl Should test for PAM (Pluggable Authentication Modules) -- AC_DEFUN(AC_PATH_PAM_DIRECT, -+ AC_DEFUN([AC_PATH_PAM_DIRECT], - [test -z "$pam_direct_test_library" && pam_direct_test_library=pam - test -z "$pam_direct_test_library" && pam_direct_test_library=pam_misc - test -z "$pam_direct_test_library" && pam_direct_test_library=dl -@@ -907,7 +596,7 @@ - LIBS="$ac_save_LIBS" - ]) - --AC_DEFUN(AC_PATH_PAM, -+AC_DEFUN([AC_PATH_PAM], - [AC_REQUIRE_CPP()dnl - - pam_includes=NONE -@@ -959,162 +648,3 @@ - AC_SUBST(PAMLIBPATHS) - - ]) -- -- --# Search path for a program which passes the given test. --# Ulrich Drepper , 1996. -- --# serial 1 -- --dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AM_PATH_PROG_WITH_TEST, --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test -n "[$]$1"; then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -- --# Do all the work for Automake. This macro actually does too much -- --# some checks are only needed if your package does certain things. --# But this isn't really a big deal. -- --# serial 1 -- --dnl Usage: --dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -- --AC_DEFUN(AM_INIT_AUTOMAKE, --[AC_REQUIRE([AM_PROG_INSTALL]) --PACKAGE=[$1] --AC_SUBST(PACKAGE) --VERSION=[$2] --AC_SUBST(VERSION) --dnl test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) --fi --ifelse([$3],, --AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") --AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) --AM_SANITY_CHECK --AC_ARG_PROGRAM --dnl FIXME This is truly gross. --missing_dir=`cd $ac_aux_dir && pwd` --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) --AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) --AC_PROG_MAKE_SET]) -- -- --# serial 1 -- --AC_DEFUN(AM_PROG_INSTALL, --[AC_REQUIRE([AC_PROG_INSTALL]) --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' --AC_SUBST(INSTALL_SCRIPT)dnl --]) -- --# --# Check to make sure that the build environment is sane. --# -- --AC_DEFUN(AM_SANITY_CHECK, --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftestfile --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -- if test "[$]*" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftestfile` -- fi -- test "[$]2" = conftestfile -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --rm -f conftest* --AC_MSG_RESULT(yes)]) -- --dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) --dnl The program must properly implement --version. --AC_DEFUN(AM_MISSING_PROG, --[AC_MSG_CHECKING(for working $2) --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if ($2 --version) < /dev/null > /dev/null 2>&1; then -- $1=$2 -- AC_MSG_RESULT(found) --else -- $1="$3/missing $2" -- AC_MSG_RESULT(missing) --fi --AC_SUBST($1)]) -- --# Like AC_CONFIG_HEADER, but automatically create stamp file. -- --AC_DEFUN(AM_CONFIG_HEADER, --[AC_PREREQ([2.12]) --AC_CONFIG_HEADER([$1]) --dnl When config.status generates a header, we must update the stamp-h file. --dnl This file resides in the same directory as the config header --dnl that is generated. We must strip everything past the first ":", --dnl and everything past the last "/". --AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl --ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, --<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, --<>; do -- case " <<$>>CONFIG_HEADERS " in -- *" <<$>>am_file "*<<)>> -- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx -- ;; -- esac -- am_indx=`expr "<<$>>am_indx" + 1` --done<<>>dnl>>) --changequote([,]))]) -- -- -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac 2014-11-19 00:41:00.462734397 -0500 -@@ -3,12 +3,12 @@ - # I used much code from Janos Farkas - - dnl Process this file with autoconf to produce a configure script. --AC_INIT(acinclude.m4) dnl a source file from your sub dir, but acinclude.m4 does the job --AC_CANONICAL_SYSTEM -+AC_INIT(kisdnlog, 0.1) -+AC_CONFIG_SRCDIR([acinclude.m4]) dnl a source file from your sub dir, but acinclude.m4 does the job -+AC_CANONICAL_TARGET - AC_ARG_PROGRAM - --dnl You have to change this --AM_INIT_AUTOMAKE(kisdnlog, 0.1) dnl searches for some needed programs -+AM_INIT_AUTOMAKE - - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) -@@ -26,15 +26,15 @@ - AC_PROG_LN_S - - dnl find out some variables --AC_AIX --AC_MINIX -+AC_USE_SYSTEM_EXTENSIONS -+AC_USE_SYSTEM_EXTENSIONS - - dnl for NLS support. Call them in this order! --AC_LANG_CPLUSPLUS dnl switch to C++ -+AC_LANG([C++]) dnl switch to C++ - AM_KDE_WITH_NLS dnl check if nls is wanted - - dnl Checks for header files. --AC_LANG_CPLUSPLUS dnl switch to C++ -+AC_LANG([C++]) dnl switch to C++ - AC_HEADER_DIRENT dnl check for dirent.h - AC_HEADER_STDC dnl check for other stdc headers. More traditional ;) - dnl check for some more header files. You can remove some of -@@ -61,8 +61,8 @@ - - dnl Checks for library functions. - AC_CHECK_FUNCS(socket vsnprintf) --AC_CHECK_SETENV --AC_LANG_CPLUSPLUS -+AC_CHECK_FUNC(setenv) -+AC_LANG([C++]) - AC_CHECK_FUNCS(getdomainname) - AC_CHECK_KSIZE_T - -@@ -74,6 +74,7 @@ - AC_SUBST(topdir) - - dnl add here all your Makefiles --AC_OUTPUT(Makefile \ -+AC_CONFIG_FILES([Makefile \ - pixmaps/Makefile \ -- src/Makefile) -+ src/Makefile]) -+AC_OUTPUT -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am 2014-11-19 00:41:00.462734397 -0500 -@@ -14,7 +14,7 @@ - # just set the variable - APPSDIR = $(kde_appsdir)/Utilities - # set the include path for X, qt and KDE --INCLUDES= @all_includes@ -+AM_CPPFLAGS = @all_includes@ - # claim, which subdirectories you want to install - # SUBDIRS = doc - -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac 2014-11-19 00:41:00.462734397 -0500 -@@ -81,45 +81,34 @@ - dnl To make it possible to set variables in policy.h - dnl they have to be defined with AC_DEFINE... - dnl --AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR") --AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE") --AC_DEFINE_UNQUOTED(DATADIR,"$datadir") --AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT) --AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE") --AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE") --AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE") --AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD") --AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD") --AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD") -+AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR",[Define the old config directory]) -+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE",[Define the name of the old config file]) -+AC_DEFINE_UNQUOTED(DATADIR,"$DATADIR",[Define the data directory]) -+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT,[Define to use a port other than 20011 by default]) -+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE",[File for permission configuration]) -+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE",[Logfile]) -+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE",[Charge file]) -+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD",[Command for reloading]) -+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD",[Command for stopping]) -+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD",[Command for rebooting]) -+CHARGECOUNTRY=DE - if test "$CONFIG_ISDN_LOG_DE" = "y" ; then -- NATION="de" -- NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ CHARGECOUNTRY=DE - fi - if test "$CONFIG_ISDN_LOG_AT" = "y" ; then -- NATION="at" -- NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ CHARGECOUNTRY=AT - fi - if test "$CONFIG_ISDN_LOG_CH" = "y" ; then -- NATION="ch" -- NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ CHARGECOUNTRY=CH - fi - if test "$CONFIG_ISDN_LOG_NL" = "y" ; then -- NATION="nl" -- NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ CHARGECOUNTRY=NL - fi - if test "$CONFIG_ISDN_LOG_LU" = "y" ; then -- NATION="lu" -- NATION_MACRO="ISDN_LU" -- AC_DEFINE(ISDN_LU) -+ CHARGECOUNTRY=LU - fi - if test "$CONFIG_ISDN_LOG_XX" = "y" ; then -- NATION=$CONFIG_ISDN_LOG_CC -- NATION_MACRO="ISDN_XX" -- AC_DEFINE(ISDN_XX) -+ CHARGECOUNTRY=XX - fi - - dnl Checks for programs. -@@ -132,17 +121,17 @@ - - dnl Checks for libraries. - if test -e tools/cdb/i4l_cdb.c ; then -- AC_DEFINE(USE_CDB) -+ AC_DEFINE(USE_CDB,1,[Use CDB instead pf g?dbm? rename tools/cdb/i4l_cdb.c, if you want to use gdbm]) - CDBEXTRALIBS="tools/cdb/i4l_cdb.a" - DBEXT=".cdb" - RDBEXT=".cdb" - AC_MSG_RESULT(Using 'cdb' as database) - else --AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM), -- [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM), -- [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])]) -+AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM,1,[Define if you have the gdbm library (-lgdbm).]), -+ [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM,1,[Define if you have the dbm library (-ldbm).]), -+ [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB,1,[Define if you have the db library (-ldb).]))])]) - fi --AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") -+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[File extension for the relational data base]) - - dnl log database support - AC_CHECK_POSTGRES -@@ -160,7 +149,7 @@ - dnl Manual config - AC_ARG_WITH(isdnlib, - [ --with-isdnlib=DIR Set isdn library [../lib]], -- LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval")) -+ LIBISDNDIR=$withval) - AC_ARG_WITH(area-lib, - [ --with-area-lib=STRING Set area library type [area]], - ALIB=$withval) -@@ -198,28 +187,38 @@ - - if test "$ALIB" = "area" ; then - LIBAREA=1 -- AC_DEFINE(LIBAREA) -+ AC_DEFINE(LIBAREA,1,[Define to 1 if libarea should be used]) - fi - case "$CHARGECOUNTRY" in - DE) - NATION="de" - NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ AC_DEFINE(ISDN_DE,1,[Define to 1 if you have German charge info]) - ;; - AT) - NATION="at" - NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ AC_DEFINE(ISDN_AT,1,[Define to 1 if you have Austrian charge info]) - ;; - CH) - NATION="ch" - NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ AC_DEFINE(ISDN_CH,1,[Define to 1 if you have Swiss charge info]) - ;; - NL) - NATION="nl" - NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ AC_DEFINE(ISDN_NL,1,[Define to 1 if you have Netherlands charge info]) -+ ;; -+ LU) -+ NATION="lu" -+ NATION_MACRO="ISDN_LU" -+ AC_DEFINE(ISDN_LU,1,[Define to 1 if you have Luxembourg charge info]) -+ ;; -+ *) -+ NATION=$CONFIG_ISDN_LOG_CC -+ NATION_MACRO="ISDN_XX" -+ AC_DEFINE(ISDN_XX,1,[Define to 1 if you have a charge info for a different country]) - ;; - esac - -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac 2014-11-19 00:41:00.462734397 -0500 -@@ -1,8 +1,13 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(mkzonedb.c) --AC_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_PREFIX_DEFAULT(/usr) - -+AH_TEMPLATE(USE_CDB, [Whether or not to use our cdb]) -+AH_TEMPLATE(HAVE_LIBGDBM, [Whether or not we have the GNU DataBase Manager library]) -+AH_TEMPLATE(HAVE_LIBDBM, [Whether or not we have the (generic) DataBase Manager library]) -+AH_TEMPLATE(HAVE_LIBDB, [Whether or not we have the DataBase library]) -+ - CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}` - CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}` - -@@ -29,7 +34,7 @@ - [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb;RDBEXT=".db"; AC_DEFINE(HAVE_LIBDB), - [AC_MSG_ERROR([No db found])])])]) - fi --AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") -+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT", [The relational database file extension]) - - dnl Checks for header files. - AC_HEADER_STDC -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am 2014-11-19 00:40:58.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am 2014-11-19 00:41:00.462734397 -0500 -@@ -7,9 +7,9 @@ - MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ - stamp-h.in comperr - --INCLUDES = $(all_includes) -+AM_CPPFLAGS = -I../capi20 $(all_includes) - CFLAGS = -Wall -O2 --LDFLAGS = $(all_libraries) -+LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - - sbin_PROGRAMS = rcapid -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac 2014-11-19 00:41:00.462734397 -0500 -@@ -1,6 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(rcapid.c) --AM_INIT_AUTOMAKE(rcapid, 1.2) -+AC_INIT(rcapid, 1.2) -+AC_CONFIG_SRCDIR(rcapid.c) -+AM_INIT_AUTOMAKE - AC_PREFIX_DEFAULT(/usr) - - CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 ---- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 2014-11-19 00:41:00.462734397 -0500 -@@ -1,5 +1,5 @@ - --AC_DEFUN(AC_FIND_FILE, -+AC_DEFUN([AC_FIND_FILE], - [ - $3=NO - for i in $2; -@@ -15,7 +15,7 @@ - done - ]) - --AC_DEFUN(AC_PATH_PKGLOGDIR, -+AC_DEFUN([AC_PATH_PKGLOGDIR], - [ - packagelogdir="`eval echo ${packagelogdir:-/var/log}`" - -@@ -26,7 +26,7 @@ - AC_SUBST(packagelogdir) - ]) - --AC_DEFUN(AC_PATH_PKGLOCKDIR, -+AC_DEFUN([AC_PATH_PKGLOCKDIR], - [ - packagelockdir="`eval echo ${packagelockdir:-/var/lock}`" - -@@ -37,7 +37,7 @@ - AC_SUBST(packagelockdir) - ]) - --AC_DEFUN(AC_PATH_PKGPIDDIR, -+AC_DEFUN([AC_PATH_PKGPIDDIR], - [ - packagepiddir="`eval echo ${packagepiddir:-/var/run}`" - -@@ -48,7 +48,7 @@ - AC_SUBST(packagepiddir) - ]) - --AC_DEFUN(AC_PATH_TCL, -+AC_DEFUN([AC_PATH_TCL], - [ - ac_tcl_inc="" - ac_tcl_lib="" -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac 2014-11-19 00:41:00.462734397 -0500 -@@ -3,12 +3,13 @@ - - ## init ################################################################### - --AC_INIT(acinclude.m4) -+AC_INIT(vbox, 3.0B1) -+AC_CONFIG_SRCDIR([acinclude.m4]) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET - AC_ARG_PROGRAM - --AM_INIT_AUTOMAKE(vbox, 3.0B1) -+AM_INIT_AUTOMAKE - - AC_PREFIX_DEFAULT(/opt/vbox) - -@@ -17,11 +18,11 @@ - ## programs ############################################################### - - AC_PROG_CC --AC_PROG_CC_WORKS --AC_PROG_CC_GNU -+#AC_PROG_CC_WORKS -+#AC_PROG_CC_GNU - - AC_PROG_RANLIB --AM_PROG_INSTALL -+AC_PROG_INSTALL - - ## libraries ############################################################## - -@@ -54,9 +55,9 @@ - - ## output ################################################################# - --AC_OUTPUT(Makefile \ -+AC_CONFIG_FILES([Makefile \ - vboxgetty/Makefile \ - vboxgetty/docs/Makefile \ -- vboxgetty/docs/de/Makefile \ - vboxgetty/examples/Makefile \ -- vboxgetty/examples/scripts/Makefile) -+ vboxgetty/examples/scripts/Makefile]) -+AC_OUTPUT -diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am 2014-11-19 00:41:00.462734397 -0500 -@@ -14,7 +14,7 @@ - - DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' - --INCLUDES = $(all_includes) $(tcl_include) -+AM_CPPFLAGS = $(all_includes) $(tcl_include) - - noinst_LIBRARIES = libvboxmodem.a - -- cgit v1.2.3