src/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch

   1 --- isdn4k-utils-CVS-2004-11-18/vbox/configure.in.ac25x 1998-11-23 10:18:04.000000000 +0100
   2 +++ isdn4k-utils-CVS-2004-11-18/vbox/configure.in       2004-11-18 17:47:52.638741078 +0100
   3 @@ -17,9 +17,9 @@
   4
   5  AC_PREFIX_DEFAULT()
   6
   7 -AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE}")
   8 -AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
   9 -AC_DEFINE_UNQUOTED(VERDATE, "${VERDATE}")
  10 +AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE}", [package])
  11 +AC_DEFINE_UNQUOTED(VERSION, "${VERSION}", [version])
  12 +AC_DEFINE_UNQUOTED(VERDATE, "${VERDATE}", [verdate])
  13
  14  AC_SUBST(PACKAGE)
  15  AC_SUBST(VERSION)
  16 @@ -87,7 +87,7 @@
  17
  18  AC_MSG_RESULT(${VBOX_SPOOLDIR})
  19
  20 -AC_DEFINE_UNQUOTED(SPOOLDIR, "${VBOX_SPOOLDIR}")
  21 +AC_DEFINE_UNQUOTED(SPOOLDIR, "${VBOX_SPOOLDIR}", [spool dir])
  22  AC_SUBST(VBOX_SPOOLDIR)
  23
  24     dnl #===============#
  25 @@ -105,7 +105,7 @@
  26
  27  AC_MSG_RESULT(${VBOX_LOGDIR})
  28
  29 -AC_DEFINE_UNQUOTED(LOGFILEDIR, "${VBOX_LOGDIR}")
  30 +AC_DEFINE_UNQUOTED(LOGFILEDIR, "${VBOX_LOGDIR}", [log dir])
  31  AC_SUBST(VBOX_LOGDIR)
  32
  33     dnl #===============#
  34 @@ -123,7 +123,7 @@
  35
  36  AC_MSG_RESULT(${VBOX_PIDDIR})
  37
  38 -AC_DEFINE_UNQUOTED(PIDFILEDIR, "${VBOX_PIDDIR}")
  39 +AC_DEFINE_UNQUOTED(PIDFILEDIR, "${VBOX_PIDDIR}", [pid dir])
  40  AC_SUBST(VBOX_PIDDIR)
  41
  42     dnl #================#
  43 @@ -141,7 +141,7 @@
  44
  45  AC_MSG_RESULT(${VBOX_LCKDIR})
  46
  47 -AC_DEFINE_UNQUOTED(LCKFILEDIR, "${VBOX_LCKDIR}")
  48 +AC_DEFINE_UNQUOTED(LCKFILEDIR, "${VBOX_LCKDIR}", [lock dir])
  49  AC_SUBST(VBOX_LCKDIR)
  50
  51     dnl #===================#
  52 @@ -159,7 +159,7 @@
  53
  54  AC_MSG_RESULT(${ISDN_GLOBAL_CONFIG})
  55
  56 -AC_DEFINE_UNQUOTED(I4LCONFDIR, "${ISDN_GLOBAL_CONFIG}")
  57 +AC_DEFINE_UNQUOTED(I4LCONFDIR, "${ISDN_GLOBAL_CONFIG}", [global config])
  58
  59  dnl #------------------------------------------------------------------------#
  60  dnl # Check and optimize compiler flags:                                     #
  61 --- isdn4k-utils-CVS-2004-11-18/vbox/acinclude.m4.ac25x 2002-07-06 02:11:19.000000000 +0200
  62 +++ isdn4k-utils-CVS-2004-11-18/vbox/acinclude.m4       2004-11-18 17:47:52.639740930 +0100
  63 @@ -49,23 +49,23 @@
  64           cos,
  65           AC_CHECK_LIB(dl,
  66              dlerror,
  67 -            [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
  68 +            AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
  69                 Tcl_CreateInterp,
  70                 LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
  71 -               [AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
  72 +               AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
  73                    Tcl_CreateInterp,
  74                    LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
  75 -                  [AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
  76 +                  AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
  77                       Tcl_CreateInterp,
  78                       LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
  79                       ,
  80                       ${gnd_tcl_lib_dir} -lm -ldl
  81 -                  )],
  82 +                  ),
  83                    ${gnd_tcl_lib_dir} -lm -ldl
  84 -               )],
  85 +               ),
  86                 ${gnd_tcl_lib_dir} -lm -ldl
  87 -            )],
  88 -         )],
  89 +            ),
  90 +         ),
  91        )
  92
  93        if (test "${LINK_TCL_LIBS}" != "")
  94 @@ -154,7 +154,7 @@
  95
  96           AC_CHECK_LIB(ncurses,
  97              resizeterm,
  98 -            AC_DEFINE(HAVE_RESIZETERM)
  99 +            AC_DEFINE(HAVE_RESIZETERM, 1, [have resizeterm])
 100  )
 101        fi
 102
 103 --- isdn4k-utils-CVS-2004-11-18/vbox/aclocal.m4.ac25x   2002-07-06 02:11:19.000000000 +0200
 104 +++ isdn4k-utils-CVS-2004-11-18/vbox/aclocal.m4 2004-11-18 17:47:52.640740782 +0100
 105 @@ -61,23 +61,23 @@
 106           cos,
 107           [AC_CHECK_LIB(dl,
 108              dlerror,
 109 -            [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
 110 +            AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
 111                 Tcl_CreateInterp,
 112                 LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
 113 -               [AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
 114 +               AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
 115                    Tcl_CreateInterp,
 116                    LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
 117 -                  [AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
 118 +                  AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
 119                       Tcl_CreateInterp,
 120                       LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
 121                       ,
 122                       ${gnd_tcl_lib_dir} -lm -ldl
 123 -                  )],
 124 +                  ),
 125                    ${gnd_tcl_lib_dir} -lm -ldl
 126 -               )],
 127 +               ),
 128                 ${gnd_tcl_lib_dir} -lm -ldl
 129 -            )],
 130 -         )],
 131 +            ),
 132 +         ),
 133        )
 134
 135        if (test "${LINK_TCL_LIBS}" != "")
 136 @@ -103,15 +103,7 @@
 137
 138                 HAVE_TCL_INCL="y"
 139                 LINK_TCL_INCL="${gnd_tcl_inc_dir}"
 140 -            fi
 141 -         else
 142 -            AC_MSG_CHECKING("for tcl header in /usr/include/tcl8.3/tcl.h")
 143 -            if (test -e "/usr/include/tcl8.3/tcl.h")
 144 -            then
 145 -               AC_MSG_RESULT("yes")
 146 -               HAVE_TCL_INCL="y"
 147 -               LINK_TCL_INCL="-I/usr/include/tcl8.3"
 148 -            else
 149 +                       else
 150                 AC_MSG_RESULT("no")
 151              fi
 152           fi
 153 --- isdn4k-utils-CVS-2004-11-18/ipppd/configure.in.ac25x        2004-08-30 16:56:36.000000000 +0200
 154 +++ isdn4k-utils-CVS-2004-11-18/ipppd/configure.in      2004-11-18 17:55:56.899083430 +0100
 155 @@ -17,21 +17,21 @@
 156  AC_PROG_CC
 157
 158  dnl Checks for libraries.
 159 -AC_CHECK_LIB(bsd, daemon,HAVE_LIBBSD=1; AC_DEFINE(HAVE_LIBBSD),
 160 +AC_CHECK_LIB(bsd, daemon,HAVE_LIBBSD=1; AC_DEFINE(HAVE_LIBBSD,1,[libbsd]),
 161         [AC_MSG_WARN(Could not find libbsd, build disabled)])
 162  dnl Replace `main' with a function in -lcrypt:
 163 -AC_CHECK_LIB(crypt, main,HAVE_LIBCRYPT=1; AC_DEFINE(HAVE_LIBCRYPT))
 164 -AC_CHECK_LIB(des, des_ecb_encrypt, HAVE_LIBDES=1; AC_DEFINE(HAVE_LIBDES))
 165 -AC_CHECK_LIB(ssl, DES_ecb_encrypt, HAVE_LIBSSL=1; AC_DEFINE(HAVE_LIBSSL))
 166 +AC_CHECK_LIB(crypt, main,HAVE_LIBCRYPT=1; AC_DEFINE(HAVE_LIBCRYPT,1,[libcrypt]))
 167 +AC_CHECK_LIB(des, des_ecb_encrypt, HAVE_LIBDES=1; AC_DEFINE(HAVE_LIBDES,1,[libdes]))
 168 +AC_CHECK_LIB(ssl, DES_ecb_encrypt, HAVE_LIBSSL=1; AC_DEFINE(HAVE_LIBSSL,1,[libssl]))
 169
 170  dnl Checks for header files.
 171  AC_HEADER_STDC
 172  AC_HEADER_SYS_WAIT
 173  AC_CHECK_HEADERS(fcntl.h limits.h paths.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h)
 174 -AC_CHECK_HEADER(shadow.h, HAVE_SHADOW_H=1; AC_DEFINE(HAVE_SHADOW_H))
 175 -AC_CHECK_HEADER(linux/isdn_lzscomp.h, HAVE_LZSCOMP_H=1; AC_DEFINE(HAVE_LZSCOMP_H))
 176 -AC_CHECK_HEADER(pcap-bpf.h, [HAVE_PCAP_BPF_H=1; AC_DEFINE(HAVE_PCAP_BPF_H)],
 177 -       [AC_CHECK_HEADER(net/bpf.h, [HAVE_NET_BPF_H=1; AC_DEFINE(HAVE_NET_BPF_H)],
 178 +AC_CHECK_HEADER(shadow.h, HAVE_SHADOW_H=1; AC_DEFINE(HAVE_SHADOW_H,1,[have shadow.h]))
 179 +AC_CHECK_HEADER(linux/isdn_lzscomp.h, HAVE_LZSCOMP_H=1; AC_DEFINE(HAVE_LZSCOMP_H,1,[isdn_lzscomp.h]))
 180 +AC_CHECK_HEADER(pcap-bpf.h, [HAVE_PCAP_BPF_H=1; AC_DEFINE(HAVE_PCAP_BPF_H,1,[pcap-bpf.h])],
 181 +       [AC_CHECK_HEADER(net/bpf.h, [HAVE_NET_BPF_H=1; AC_DEFINE(HAVE_NET_BPF_H,1,[net/bpf.h])],
 182                 [AC_MSG_ERROR(Could not find pcap header file)])])
 183
 184  dnl Checks for typedefs, structures, and compiler characteristics.
 185 @@ -51,62 +51,63 @@
 186  AC_ARG_WITH(sbin,
 187         [  --with-sbin=DIR         Set directory where ipppd is istalled. [/sbin]],
 188         CONFIG_SBINDIR="${withval}"
 189 -       AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
 190 +       AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
 191  )
 192
 193  dnl Optional man directory
 194  AC_ARG_WITH(sbin,
 195         [  --with-man=DIR          Set manpage directory. [/usr/man]],
 196         CONFIG_MANDIR="${withval}"
 197 -       AC_DEFINE(CONFIG_MANDIR,"${withval}"),
 198 +       AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
 199  )
 200
 201  dnl Optional /var/run directory
 202  AC_ARG_WITH(sbin,
 203         [  --with-varrun=DIR       Set directory for .pid files. [/var/run]],
 204         CONFIG_RUNDIR="${withval}"
 205 -       AC_DEFINE(CONFIG_RUNDIR,"${withval}"),
 206 +       AC_DEFINE(CONFIG_RUNDIR,"${withval}",[/var/run dir]),
 207  )
 208
 209  dnl Optional MSCHAP
 210  AC_ARG_ENABLE(mschap,
 211         [  --enable-mschap         Enable Microsoft chap authentication [no]],
 212         CONFIG_IPPPD_MSCHAP="y"
 213 -       AC_DEFINE(CONFIG_IPPPD_MSCHAP,"y"),
 214 +       AC_DEFINE(CONFIG_IPPPD_MSCHAP,"y",[support M$-chap]),
 215  )
 216
 217  dnl Optional RADIUS
 218  AC_ARG_ENABLE(radius,
 219         [  --enable-radius         Enable RADIUS authentication [no]],
 220         CONFIG_IPPPD_RADIUS="y"
 221 -       AC_DEFINE(CONFIG_IPPPD_RADIUS,"y"),
 222 +       AC_DEFINE(CONFIG_IPPPD_RADIUS,"y",[support radius]),
 223  )
 224
 225  dnl Optional radiusclient config file
 226  AC_ARG_WITH(radiusclient_config,
 227         [  --with-radiusclient=FILE Set filename for radiusclient configuration],
 228         RADIUS_CLIENT_CONFIG_FILE="${withval}"
 229 -       AC_DEFINE(RADIUS_CLIENT_CONFIG_FILE,"${withval}"),
 230 +       AC_DEFINE(RADIUS_CLIENT_CONFIG_FILE,"${withval}",[radius config]),
 231  )
 232
 233  dnl Optional RADIUS_WTMP_LOGGING
 234  AC_ARG_ENABLE(radius_wtmp_logging,
 235         [  --enable-radius-wtmp       Enable RADIUS_WTMP_LOGGING authentication [no]],
 236         CONFIG_IPPPD_RADIUS_WTMP_LOGGING="y"
 237 -       AC_DEFINE(CONFIG_IPPPD_RADIUS_WTMP_LOGGING,"y"),
 238 +       AC_DEFINE(CONFIG_IPPPD_RADIUS_WTMP_LOGGING,"y",[radius logging]),
 239  )
 240
 241  dnl Optional DEBUGGING
 242  AC_ARG_ENABLE(debug,
 243         [  --enable-debug          Enable debugging [no]],
 244         CONFIG_IPPPD_DEBUGFLAGS="-DDEBUGALL"
 245 -       AC_DEFINE(CONFIG_IPPPD_DEBUGFLAGS,"-DDEBUGALL"),
 246 +       AC_DEFINE(CONFIG_IPPPD_DEBUGFLAGS,"-DDEBUGALL",[options]),
 247  )
 248
 249  AC_ARG_ENABLE(ippp-filter,
 250         [  --enable-ippp-filter    Enable IPPP Filters (needs kernel supports) [no]],
 251         CONFIG_IPPP_FILTER="y"
 252         AC_DEFINE(CONFIG_IPPP_FILTER,"y"),
 253 +       AC_DEFINE(CONFIG_IPPP_FILTER,"y", [ipppd filter]),
 254  )
 255
 256  AC_SUBST(I4LVERSION)
 257 --- isdn4k-utils-CVS-2004-11-18/isdnlog/configure.in.ac25x      2004-10-28 03:53:29.000000000 +0200
 258 +++ isdn4k-utils-CVS-2004-11-18/isdnlog/configure.in    2004-11-18 17:47:52.642740487 +0100
 259 @@ -79,45 +79,46 @@
 260  dnl To make it possible to set variables in policy.h
 261  dnl they have to be defined with AC_DEFINE...
 262  dnl
 263 -AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR")
 264 -AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE")
 265 -AC_DEFINE_UNQUOTED(DATADIR,"$datadir")
 266 -AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT)
 267 -AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE")
 268 -AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE")
 269 -AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE")
 270 -AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD")
 271 -AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD")
 272 -AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD")
 273 +AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR", [old config dir])
 274 +AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE", [old config file])
 275 +AC_DEFINE_UNQUOTED(DATADIR,"$datadir", [data dir])
 276 +AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT, [server port])
 277 +AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE", [user file])
 278 +AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE", [log file])
 279 +AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE", [charge file])
 280 +AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD", [reload command])
 281 +AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD", [stop command])
 282 +AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD", [reboot command])
 283 +
 284  if test "$CONFIG_ISDN_LOG_DE" = "y" ; then
 285         NATION="de"
 286         NATION_MACRO="ISDN_DE"
 287 -       AC_DEFINE(ISDN_DE)
 288 +       AC_DEFINE(ISDN_DE, 1, [German ISDN])
 289  fi
 290  if test "$CONFIG_ISDN_LOG_AT" = "y" ; then
 291         NATION="at"
 292         NATION_MACRO="ISDN_AT"
 293 -       AC_DEFINE(ISDN_AT)
 294 +       AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
 295  fi
 296  if test "$CONFIG_ISDN_LOG_CH" = "y" ; then
 297         NATION="ch"
 298         NATION_MACRO="ISDN_CH"
 299 -       AC_DEFINE(ISDN_CH)
 300 +       AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
 301  fi
 302  if test "$CONFIG_ISDN_LOG_NL" = "y" ; then
 303         NATION="nl"
 304         NATION_MACRO="ISDN_NL"
 305 -       AC_DEFINE(ISDN_NL)
 306 +       AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
 307  fi
 308  if test "$CONFIG_ISDN_LOG_LU" = "y" ; then
 309         NATION="lu"
 310         NATION_MACRO="ISDN_LU"
 311 -       AC_DEFINE(ISDN_LU)
 312 +       AC_DEFINE(ISDN_LU, 1, [Luxembourg ISDN])
 313  fi
 314  if test "$CONFIG_ISDN_LOG_XX" = "y" ; then
 315         NATION=$CONFIG_ISDN_LOG_CC
 316         NATION_MACRO="ISDN_XX"
 317 -       AC_DEFINE(ISDN_XX)
 318 +       AC_DEFINE(ISDN_XX, 1, [Other country])
 319  fi
 320
 321  dnl Checks for programs.
 322 @@ -130,17 +131,17 @@
 323
 324  dnl Checks for libraries.
 325  if test -e tools/cdb/i4l_cdb.c  ; then
 326 -    AC_DEFINE(USE_CDB)
 327 +    AC_DEFINE(USE_CDB, 1, [Use CDB])
 328      CDBEXTRALIBS="tools/cdb/i4l_cdb.a"
 329      DBEXT=".cdb"
 330      RDBEXT=".cdb"
 331      AC_MSG_RESULT(Using 'cdb' as database)
 332  else
 333 -AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM),
 334 -       [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM),
 335 -               [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])])
 336 +AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]),
 337 +       AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]),
 338 +               AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb]))))
 339  fi
 340 -AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")
 341 +AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension])
 342
 343  dnl log database support
 344  AC_CHECK_POSTGRES
 345 @@ -158,7 +159,7 @@
 346  dnl Manual config
 347  AC_ARG_WITH(isdnlib,
 348         [  --with-isdnlib=DIR      Set isdn library [../lib]],
 349 -       LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval"))
 350 +       LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval",[libisdn dir]))
 351  AC_ARG_WITH(area-lib,
 352         [  --with-area-lib=STRING  Set area library type [area]],
 353         ALIB=$withval)
 354 @@ -167,16 +168,16 @@
 355         CHARGECOUNTRY=$withval)
 356  AC_ARG_WITH(oldconfdir,
 357         [  --with-oldconfdir=DIR   Set old config directory [/etc/isdnlog]],
 358 -       OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval"))
 359 +       OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval", [old config dir]))
 360  AC_ARG_WITH(oldconf,
 361         [  --with-oldconf=NAME     Set old config file name [isdnlog.conf]],
 362 -       OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval"))
 363 +       OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval", [old config file]))
 364  AC_ARG_WITH(datadir,
 365          [  --with-datadir=DIR      Set data directory [/usr/lib/isdn]],
 366 -        datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval"))
 367 +        datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval", [data dir]))
 368  AC_ARG_WITH(sport,
 369         [  --with-sport=INT        Set server port [20011]],
 370 -       SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval))
 371 +       SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval, [server port]))
 372
 373  dnl Checks for typedefs, structures, and compiler characteristics.
 374  AC_C_CONST
 375 @@ -196,28 +197,28 @@
 376
 377  if test "$ALIB" = "area" ; then
 378         LIBAREA=1
 379 -       AC_DEFINE(LIBAREA)
 380 +       AC_DEFINE(LIBAREA, 1, [libarea])
 381  fi
 382  case "$CHARGECOUNTRY" in
 383         DE)
 384                 NATION="de"
 385                 NATION_MACRO="ISDN_DE"
 386 -               AC_DEFINE(ISDN_DE)
 387 +               AC_DEFINE(ISDN_DE, 1, [German ISDN])
 388                 ;;
 389         AT)
 390                 NATION="at"
 391                 NATION_MACRO="ISDN_AT"
 392 -               AC_DEFINE(ISDN_AT)
 393 +               AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
 394                 ;;
 395         CH)
 396                 NATION="ch"
 397                 NATION_MACRO="ISDN_CH"
 398 -               AC_DEFINE(ISDN_CH)
 399 +               AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
 400                 ;;
 401         NL)
 402                 NATION="nl"
 403                 NATION_MACRO="ISDN_NL"
 404 -               AC_DEFINE(ISDN_NL)
 405 +               AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
 406                 ;;
 407  esac
 408
 409 --- isdn4k-utils-CVS-2004-11-18/isdnlog/aclocal.m4.ac25x        2002-07-19 21:03:55.000000000 +0200
 410 +++ isdn4k-utils-CVS-2004-11-18/isdnlog/aclocal.m4      2004-11-18 17:47:52.643740339 +0100
 411 @@ -45,13 +45,13 @@
 412         if test "$pqdir" != "no" ; then
 413                 AC_MSG_RESULT("yes")
 414                 POSTGRES=1
 415 -               AC_DEFINE_UNQUOTED(POSTGRES,1)
 416 +               AC_DEFINE_UNQUOTED(POSTGRES,1,[postgres support])
 417         else
 418                 AC_MSG_RESULT("no POSTGRES DISABLED")
 419                 pqdir=""
 420         fi
 421         POSTGRESDIR="$pqdir"
 422 -       AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir")
 423 +       AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[postgres dir])
 424         AC_SUBST(POSTGRES)
 425         AC_SUBST(POSTGRESDIR)
 426  ])
 427 @@ -108,13 +108,13 @@
 428         if test "$mydir" != "no" ; then
 429                 AC_MSG_RESULT("yes")
 430                 MYSQLDB=1
 431 -               AC_DEFINE_UNQUOTED(MYSQLDB,1)
 432 +               AC_DEFINE_UNQUOTED(MYSQLDB,1,[MySQL support])
 433         else
 434                 AC_MSG_RESULT("no MYSQL DISABLED")
 435                 mydir=""
 436         fi
 437         MYSQLDIR="$mydir"
 438 -       AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir")
 439 +       AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[MySQL dir])
 440         AC_SUBST(MYSQLDB)
 441         AC_SUBST(MYSQLDIR)
 442  ])
 443 @@ -134,7 +134,7 @@
 444         if test "$oradir" != "no" ; then
 445                 AC_MSG_RESULT("yes")
 446                 ORACLE=1
 447 -               AC_DEFINE_UNQUOTED(ORACLE,1)
 448 +               AC_DEFINE_UNQUOTED(ORACLE,1,[oracle support, unsupported])
 449         else
 450                 AC_MSG_RESULT("no ORACLE DISABLED")
 451         fi
 452 --- isdn4k-utils-CVS-2004-11-18/vbox3/configure.in.ac25x        1998-11-10 19:36:19.000000000 +0100
 453 +++ isdn4k-utils-CVS-2004-11-18/vbox3/configure.in      2004-11-18 17:47:52.644740191 +0100
 454 @@ -17,11 +17,9 @@
 455  ## programs ###############################################################
 456
 457  AC_PROG_CC
 458 -AC_PROG_CC_WORKS
 459 -AC_PROG_CC_GNU
 460
 461  AC_PROG_RANLIB
 462 -AM_PROG_INSTALL
 463 +AC_PROG_INSTALL
 464
 465  ## libraries ##############################################################
 466
 467 --- isdn4k-utils-CVS-2004-11-18/vbox3/vboxgetty/Makefile.am.ac25x       1998-11-10 19:36:25.000000000 +0100
 468 +++ isdn4k-utils-CVS-2004-11-18/vbox3/vboxgetty/Makefile.am     2004-11-18 17:47:52.644740191 +0100
 469 @@ -12,7 +12,7 @@
 470
 471  ## vboxgetty ##############################################################
 472
 473 -DEFS                  += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
 474 +DEFS                   = -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
 475
 476  INCLUDES               = $(all_includes) $(tcl_include)
 477
 478 --- isdn4k-utils-CVS-2004-11-18/isdnctrl/configure.in.ac25x     2002-07-19 23:23:54.000000000 +0200
 479 +++ isdn4k-utils-CVS-2004-11-18/isdnctrl/configure.in   2004-11-18 17:47:52.645740043 +0100
 480 @@ -30,21 +30,21 @@
 481  AC_ARG_WITH(sbin,
 482         [  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
 483         CONFIG_SBINDIR="${withval}"
 484 -       AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
 485 +       AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
 486  )
 487
 488  dnl Optional man directory
 489  AC_ARG_WITH(man,
 490         [  --with-man=DIR          Set manpage dir. [/usr/man]],
 491         CONFIG_MANDIR="${withval}"
 492 -       AC_DEFINE(CONFIG_MANDIR,"${withval}"),
 493 +       AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
 494  )
 495
 496  dnl Optional config-file-option
 497  AC_ARG_ENABLE(cfile,
 498         [  --enable-cfile          Enable configfile option [no]],
 499         CONFIG_ISDNCTRL_CONF=y
 500 -       AC_DEFINE(CONFIG_ISDNCTRL_CONF,y),
 501 +       AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable config file]),
 502  )
 503
 504  AC_SUBST(INSTALL)
 505 --- isdn4k-utils-CVS-2004-11-18/imon/configure.in.ac25x 2002-07-19 21:03:53.000000000 +0200
 506 +++ isdn4k-utils-CVS-2004-11-18/imon/configure.in       2004-11-18 17:47:52.646739895 +0100
 507 @@ -38,14 +38,14 @@
 508  AC_ARG_WITH(sbin,
 509         [  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
 510         CONFIG_SBINDIR="${withval}"
 511 -       AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
 512 +       AC_DEFINE(CONFIG_SBINDIR,"${withval}",[kernel directory]),
 513  )
 514
 515  dnl Optional man directory
 516  AC_ARG_WITH(man,
 517 -       [  --with-man=DIR          Set manpage dir. [/usr/man]],
 518 +       [  --with-man=DIR          Set manpage dir. [/usr/share/man]],
 519         CONFIG_MANDIR="${withval}"
 520 -       AC_DEFINE(CONFIG_MANDIR,"${withval}"),
 521 +       AC_DEFINE(CONFIG_MANDIR,"${withval}",[man directory]),
 522  )
 523
 524  AC_SUBST(INSTALL)
 525 --- isdn4k-utils-CVS-2004-11-18/eicon/configure.in.ac25x        2002-07-19 20:42:01.000000000 +0200
 526 +++ isdn4k-utils-CVS-2004-11-18/eicon/configure.in      2004-11-18 17:47:52.646739895 +0100
 527 @@ -35,21 +35,21 @@
 528  AC_ARG_WITH(firmware,
 529         [  --with-firmware=DIR     Set dir where firmware istalled. [/usr/lib/isdn]],
 530         CONFIG_DATADIR="${withval}"
 531 -       AC_DEFINE(CONFIG_DATADIR,"${withval}"),
 532 +       AC_DEFINE(CONFIG_DATADIR,"${withval}",[data dir]),
 533  )
 534
 535  dnl Optional sbin directory
 536  AC_ARG_WITH(sbin,
 537         [  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
 538         CONFIG_SBINDIR="${withval}"
 539 -       AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
 540 +       AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
 541  )
 542
 543  dnl Optional man directory
 544  AC_ARG_WITH(man,
 545         [  --with-man=DIR          Set manpage dir. [/usr/man]],
 546         CONFIG_MANDIR="${withval}"
 547 -       AC_DEFINE(CONFIG_MANDIR,"${withval}"),
 548 +       AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
 549  )
 550
 551  dnl Check, if user wants dump option for debugging
 552 @@ -58,10 +58,10 @@
 553         CONFIG_EICONCTRL_DEBUG="y"
 554  )
 555
 556 -AC_DEFINE(HAVE_XLOG)
 557 +AC_DEFINE(HAVE_XLOG,1,[define if you have xlog])
 558  AC_SUBST(HAVE_XLOG)
 559
 560 -AC_DEFINE(HAVE_TRACE)
 561 +AC_DEFINE(HAVE_TRACE,1,[define if you have trace])
 562  AC_SUBST(HAVE_TRACE)
 563
 564  AC_SUBST(HAVE_NPCI)