--- isdn4k-utils/imon/configure.in.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imon/configure.in	2013-11-23 12:58:32.616668380 +0100
@@ -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}",[kernel directory]),
 )
 
 dnl Optional man directory
 AC_ARG_WITH(man,
-	[  --with-man=DIR          Set manpage dir. [/usr/man]],
+	[  --with-man=DIR          Set manpage dir. [/usr/share/man]],
 	CONFIG_MANDIR="${withval}"
-	AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+	AC_DEFINE(CONFIG_MANDIR,"${withval}",[man directory]),
 )
 
 AC_SUBST(INSTALL)
--- isdn4k-utils/isdnctrl/configure.in.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnctrl/configure.in	2013-11-23 12:58:32.616668380 +0100
@@ -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}",[sbin dir]),
 )
 
 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}",[man dir]),
 )
 
 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 config file]),
 )
 
 AC_SUBST(INSTALL)
--- isdn4k-utils/isdnlog/aclocal.m4.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/aclocal.m4	2013-11-23 12:58:32.615668404 +0100
@@ -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,[postgres support])
 	else
 		AC_MSG_RESULT("no POSTGRES DISABLED")
 		pqdir=""
 	fi
 	POSTGRESDIR="$pqdir"
-	AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir")
+	AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[postgres dir])
 	AC_SUBST(POSTGRES)
 	AC_SUBST(POSTGRESDIR)
 ])
@@ -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,[MySQL support])
 	else
 		AC_MSG_RESULT("no MYSQL DISABLED")
 		mydir=""
 	fi
 	MYSQLDIR="$mydir"
-	AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir")
+	AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[MySQL dir])
 	AC_SUBST(MYSQLDB)
 	AC_SUBST(MYSQLDIR)
 ])
@@ -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,[oracle support, unsupported])
 	else
 		AC_MSG_RESULT("no ORACLE DISABLED")
 	fi
--- isdn4k-utils/isdnlog/configure.in.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/configure.in	2013-11-23 12:58:32.615668404 +0100
@@ -81,45 +81,46 @@
 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", [old config dir])
+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE", [old config file])
+AC_DEFINE_UNQUOTED(DATADIR,"$datadir", [data dir])
+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT, [server port])
+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE", [user file])
+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE", [log file])
+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE", [charge file])
+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD", [reload command])
+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD", [stop command])
+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD", [reboot command])
+
 if test "$CONFIG_ISDN_LOG_DE" = "y" ; then
 	NATION="de"
 	NATION_MACRO="ISDN_DE"
-	AC_DEFINE(ISDN_DE)
+	AC_DEFINE(ISDN_DE, 1, [German ISDN])
 fi
 if test "$CONFIG_ISDN_LOG_AT" = "y" ; then
 	NATION="at"
 	NATION_MACRO="ISDN_AT"
-	AC_DEFINE(ISDN_AT)
+	AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
 fi
 if test "$CONFIG_ISDN_LOG_CH" = "y" ; then
 	NATION="ch"
 	NATION_MACRO="ISDN_CH"
-	AC_DEFINE(ISDN_CH)
+	AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
 fi
 if test "$CONFIG_ISDN_LOG_NL" = "y" ; then
 	NATION="nl"
 	NATION_MACRO="ISDN_NL"
-	AC_DEFINE(ISDN_NL)
+	AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
 fi
 if test "$CONFIG_ISDN_LOG_LU" = "y" ; then
 	NATION="lu"
 	NATION_MACRO="ISDN_LU"
-	AC_DEFINE(ISDN_LU)
+	AC_DEFINE(ISDN_LU, 1, [Luxembourg ISDN])
 fi
 if test "$CONFIG_ISDN_LOG_XX" = "y" ; then
 	NATION=$CONFIG_ISDN_LOG_CC
 	NATION_MACRO="ISDN_XX"
-	AC_DEFINE(ISDN_XX)
+	AC_DEFINE(ISDN_XX, 1, [Other country])
 fi
 
 dnl Checks for programs.
@@ -132,17 +133,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])
     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, [Use libgdbm]),
+	AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]),
+		AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb]))))
 fi
-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")
+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension])
 
 dnl log database support
 AC_CHECK_POSTGRES
@@ -160,7 +161,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_DEFINE_UNQUOTED(LIBISDNDIR,"$withval",[libisdn dir]))
 AC_ARG_WITH(area-lib,
 	[  --with-area-lib=STRING  Set area library type [area]],
 	ALIB=$withval)
@@ -169,16 +170,16 @@
 	CHARGECOUNTRY=$withval)
 AC_ARG_WITH(oldconfdir,
 	[  --with-oldconfdir=DIR   Set old config directory [/etc/isdnlog]],
-	OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval"))
+	OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval", [old config dir]))
 AC_ARG_WITH(oldconf,
 	[  --with-oldconf=NAME     Set old config file name [isdnlog.conf]],
-	OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval"))
+	OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval", [old config file]))
 AC_ARG_WITH(datadir,
         [  --with-datadir=DIR      Set data directory [/usr/lib/isdn]],
-        datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval"))
+        datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval", [data dir]))
 AC_ARG_WITH(sport,
 	[  --with-sport=INT        Set server port [20011]],
-	SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval))
+	SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval, [server port]))
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -198,28 +199,28 @@
 
 if test "$ALIB" = "area" ; then
 	LIBAREA=1
-	AC_DEFINE(LIBAREA)
+	AC_DEFINE(LIBAREA, 1, [libarea])
 fi
 case "$CHARGECOUNTRY" in
 	DE)
 		NATION="de"
 		NATION_MACRO="ISDN_DE"
-		AC_DEFINE(ISDN_DE)
+		AC_DEFINE(ISDN_DE, 1, [German ISDN])
 		;;
 	AT)
 		NATION="at"
 		NATION_MACRO="ISDN_AT"
-		AC_DEFINE(ISDN_AT)
+		AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
 		;;
 	CH)
 		NATION="ch"
 		NATION_MACRO="ISDN_CH"
-		AC_DEFINE(ISDN_CH)
+		AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
 		;;
 	NL)
 		NATION="nl"
 		NATION_MACRO="ISDN_NL"
-		AC_DEFINE(ISDN_NL)
+		AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
 		;;
 esac
 
--- isdn4k-utils/vbox3/configure.in.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox3/configure.in	2013-11-23 12:58:32.615668404 +0100
@@ -17,11 +17,9 @@
 ## programs ###############################################################
 
 AC_PROG_CC
-AC_PROG_CC_WORKS
-AC_PROG_CC_GNU
 
 AC_PROG_RANLIB
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 
 ## libraries ##############################################################
 
--- isdn4k-utils/vbox3/vboxgetty/Makefile.am.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox3/vboxgetty/Makefile.am	2013-11-23 12:58:32.615668404 +0100
@@ -12,7 +12,7 @@
 
 ## vboxgetty ##############################################################
 
-DEFS		       += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
+DEFS		        = -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
 
 INCLUDES		= $(all_includes) $(tcl_include)
 
--- isdn4k-utils/vbox/aclocal.m4.ac25x	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox/aclocal.m4	2013-11-23 12:58:32.615668404 +0100
@@ -103,15 +103,7 @@
 
                HAVE_TCL_INCL="y"
                LINK_TCL_INCL="${gnd_tcl_inc_dir}"
-            fi
-         else
-            AC_MSG_CHECKING("for tcl header in /usr/include/tcl8.3/tcl.h")
-            if (test -e "/usr/include/tcl8.3/tcl.h")
-            then
-               AC_MSG_RESULT("yes")
-               HAVE_TCL_INCL="y"
-               LINK_TCL_INCL="-I/usr/include/tcl8.3"
-            else
+			else
                AC_MSG_RESULT("no")
             fi
          fi