diff --git a/Makefile b/Makefile index 8787c983..a1a46fcc 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # Toplevel Makefile for isdn4k-utils # -export I4LVERSION = 2.1 +export I4LVERSION = 2.1b1 all: do-it-all diff --git a/README b/README index 97939bfa..b38b129c 100644 --- a/README +++ b/README @@ -78,17 +78,13 @@ System prerequisites: Run "make" - This builds all utilities except the Tcl/Tk-script "isdnmon" + This builds all previously selected utilities. 4. Installation For the following steps, root permissions are necessary - a) Create the device-inodes: - - make devices - - b) Install the utilities, the man pages and config-files: + Install the utilities, the man pages and config-files: make install diff --git a/doc/Configure.help b/doc/Configure.help index 872ea483..2173d70c 100644 --- a/doc/Configure.help +++ b/doc/Configure.help @@ -21,12 +21,15 @@ CONFIG_EXPERIMENTAL you say Y here, you will be offered the choice of using features or that are currently considered to be in the alpha-test phase. -General configuration directory -CONFIG_I4LCONFDIR - Some of the programs in this package need global configuration - files. This option tells them where to expect these files. - During installation, some sample files may be installed there - also. +CONFIG_BUILDX11 + With this option you can disable the installation of all programs + which require X11. If xmkmf is missing, this option will be + automatically disabled for you. + +CONFIG_KERNELDIR + Some programs need special include files from non-standard locations + within the kernel source. The default is /usr/src/linux. Change this + setting to fit your local environment. Directory to install binaries CONFIG_BINDIR @@ -48,6 +51,67 @@ CONFIG_MANDIR man pages go into some subdirectory below this directory depending on the section they belong to. +CONFIG_RUNDIR + Some applications create special files for managing their + process IDs. This option selects the directory where to create + these ".pid" files. Usually this is /var/run. + +CONFIG_LOCKDIR + Some applications create special files for resource locking. + This option selects the directory where to create these files. + Usually this is /var/lock. + +CONFIG_LOCKFILE + Some applications create special files for resource locking. + This option selects the fixed part of name for these files. + The variable part depends on the application. Usually you + can accept the "LCK.." default here. + +General configuration directory +CONFIG_I4LCONFDIR + Some of the programs in this package need global configuration + files. This option tells them where to expect these files. + During installation, some sample files may be installed there + also. + +CONFIG_CONFFILE + This is the name of the global configuration file. + +CONFIG_CALLERIDFILE + This option defines the name for the global callerid file. + In this file, well-known names can be assigned to phone numbers. + Some of the applications then display the names instead of + phone numbers. + +CONFIG_USERCONFFILE + In addition to the global config file, some applications allow + user-specific settings. This option tells, which filename to + use for these settings. + +CONFIG_COUNTRY_PREFIX + This option defines the prefix to be dialed before the country code + on international calls. + +CONFIG_AREA_PREFIX + This option defines the prefix to be dialed before the area code + on national calls. + +CONFIG_COUNTRYCODE + Put your local country code WITHOUT prefix here. + +CONFIG_AREACODE + Put your local area code WITHOUT prefix here. + +CONFIG_LIB_AREACODE + For resolving areacodes to city names, a database library is used. + With this option, you can select between two database librarys. + The recommended library is "Areacode", however those who want to reuse + their old datafiles, can select the old "Avon" library here. + +CONFIG_AREACODE_DATA + With this option, the directory for the areacode database can be + selected. + Build isdnctrl tool CONFIG_ISDNCTRL This program is the main configuration utility for all linklevel @@ -106,12 +170,36 @@ CONFIG_PCBITCTL can download protocol firmware into cards. This program is documented in pcbitctl (8). +CONFIG_AVMCAPICTRL + This program is used to configure the avm-b1 driver. With this tool + you can download protocol firmware int cards. + This program is documented in avmcapictrl (8). + +CONFIG_LOOPCTRL + This program is used to configure the loop driver. This tool is + marked experimental, since the driver is NOT included in standard + kernel. It is mainly for testing purposes. + This program is documented in loopctrl (8). + +CONFIG_LOOPCTRL_LOOPDIR + Since loopctrl uses header files from the source of the ISDN loop + driver, you have to define the directory where those can be found. + Build imon CONFIG_IMON This is a userlevel program to monitor the activity of isdn4linux. It is tty based and uses ncurses to produce a nice screen. This program is documented in imon (1). +CONFIG_IMONTTY + This is a userlevel program to monitor the activity of isdn4linux. + It is tty based does NOT use (n)curses. + This program is documented in imontty (1). + +CONFIG_ISDNLOG + This program is mainly for monitoring activity. It has been extended + to do a lot of more however. See isdnlog/README for more information. + Install generic man pages CONFIG_GENMAN If enabled, in addition to the tool's man pages, the following generic diff --git a/icn/aclocal.m4 b/icn/aclocal.m4 index 0d5b5a65..d326d3b3 100644 --- a/icn/aclocal.m4 +++ b/icn/aclocal.m4 @@ -4,6 +4,7 @@ dnl AC_DEFUN(AC_FIND_KERNEL, [ KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -35,6 +36,7 @@ AC_DEFUN(AC_FIND_KERNEL, [ AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" AC_DEFINE_UNQUOTED(KERNELDIR,"$lxdir") AC_SUBST(KERNELDIR) ]) diff --git a/icn/configure b/icn/configure index fc65d84d..fd37d453 100755 --- a/icn/configure +++ b/icn/configure @@ -982,6 +982,7 @@ done KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -996,12 +997,12 @@ fi echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1017,12 +1018,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1037,12 +1038,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1059,6 +1060,7 @@ rm -f conftest* { echo "configure: error: "Kernel source not found. You MUST specify a correct path to the linux source in the configuration."" 1>&2; exit 1; } fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" cat >> confdefs.h < conftest.$ac_ext < Autoconf TIOCGETP @@ -1092,7 +1094,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1120,7 +1122,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1174,7 +1176,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else diff --git a/loop/aclocal.m4 b/loop/aclocal.m4 index 0d5b5a65..d326d3b3 100644 --- a/loop/aclocal.m4 +++ b/loop/aclocal.m4 @@ -4,6 +4,7 @@ dnl AC_DEFUN(AC_FIND_KERNEL, [ KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -35,6 +36,7 @@ AC_DEFUN(AC_FIND_KERNEL, [ AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" AC_DEFINE_UNQUOTED(KERNELDIR,"$lxdir") AC_SUBST(KERNELDIR) ]) diff --git a/loop/configure b/loop/configure index 319820d3..bf2555c7 100755 --- a/loop/configure +++ b/loop/configure @@ -982,6 +982,7 @@ done KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -996,12 +997,12 @@ fi echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1017,12 +1018,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1037,12 +1038,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1059,6 +1060,7 @@ rm -f conftest* { echo "configure: error: "Kernel source not found. You MUST specify a correct path to the linux source in the configuration."" 1>&2; exit 1; } fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" cat >> confdefs.h < conftest.$ac_ext < Autoconf TIOCGETP @@ -1092,7 +1094,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1120,7 +1122,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1174,7 +1176,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else diff --git a/pcbit/aclocal.m4 b/pcbit/aclocal.m4 index 0d5b5a65..d326d3b3 100644 --- a/pcbit/aclocal.m4 +++ b/pcbit/aclocal.m4 @@ -4,6 +4,7 @@ dnl AC_DEFUN(AC_FIND_KERNEL, [ KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -35,6 +36,7 @@ AC_DEFUN(AC_FIND_KERNEL, [ AC_MSG_ERROR("Kernel source not found. You MUST specify a correct path to the linux source in the configuration.") fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" AC_DEFINE_UNQUOTED(KERNELDIR,"$lxdir") AC_SUBST(KERNELDIR) ]) diff --git a/pcbit/configure b/pcbit/configure index 29406d18..e7aec456 100755 --- a/pcbit/configure +++ b/pcbit/configure @@ -976,6 +976,7 @@ done KERNELDIR="" + OLD_CPPFLAGS="$CPPFLAGS" lxdir="no" tst_kerneldir="$CONFIG_KERNELDIR" @@ -990,12 +991,12 @@ fi echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1011,12 +1012,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1031,12 +1032,12 @@ rm -f conftest* echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 CPPFLAGS="-nostdinc -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1053,6 +1054,7 @@ rm -f conftest* { echo "configure: error: "Kernel source not found. You MUST specify a correct path to the linux source in the configuration."" 1>&2; exit 1; } fi KERNELDIR="$lxdir" + CPPFLAGS="$OLD_CPPFLAGS" cat >> confdefs.h < conftest.$ac_ext < Autoconf TIOCGETP @@ -1086,7 +1088,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1114,7 +1116,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/scripts/defconfig b/scripts/defconfig index d67e5532..32deea91 100644 --- a/scripts/defconfig +++ b/scripts/defconfig @@ -85,7 +85,7 @@ CONFIG_XMONISDN_DOWNCMD='/sbin/netdown' # # Applications # -CONFIG_VBOX=n +CONFIG_VBOX=y # # Options for vbox package