Removed defaults from .Config.in scripts, since these are in
scripts/defconfig anyway.
This commit is contained in:
Fritz Elfert
parent
3a1963eb6c
commit
a754d6818c
|
|
@ -1,18 +1,21 @@
|
|||
mainmenu_option next_comment
|
||||
comment 'Options for isdnlog package'
|
||||
int 'Server listen at port' CONFIG_ISDNLOG_SERV_PORT 20011
|
||||
string 'User file' CONFIG_ISDNLOG_USERFILE 'isdnlog.users'
|
||||
string 'Charge file' CONFIG_ISDNLOG_CHARGEFILE 'charge.dat'
|
||||
string 'Log file' CONFIG_ISDNLOG_LOGFILE '/var/log/isdn.log'
|
||||
string 'Reload command' CONFIG_ISDNLOG_RELOADCMD 'reload'
|
||||
string 'Stop command' CONFIG_ISDNLOG_STOPCMD 'stop'
|
||||
string 'Reboot command' CONFIG_ISDNLOG_REBOOTCMD '/sbin/reboot'
|
||||
string 'Old config directory' CONFIG_ISDNLOG_OLDI4LCONFDIR '/etc/isdnlog'
|
||||
string 'Old config file' CONFIG_ISDNLOG_OLDI4LCONFFILE 'isdnlog.conf'
|
||||
int 'Server listen at port' CONFIG_ISDNLOG_SERV_PORT
|
||||
string 'User file' CONFIG_ISDNLOG_USERFILE
|
||||
string 'Charge file' CONFIG_ISDNLOG_CHARGEFILE
|
||||
string 'Log file' CONFIG_ISDNLOG_LOGFILE
|
||||
string 'Reload command' CONFIG_ISDNLOG_RELOADCMD
|
||||
string 'Stop command' CONFIG_ISDNLOG_STOPCMD
|
||||
string 'Reboot command' CONFIG_ISDNLOG_REBOOTCMD
|
||||
string 'Old config directory' CONFIG_ISDNLOG_OLDI4LCONFDIR
|
||||
string 'Old config file' CONFIG_ISDNLOG_OLDI4LCONFFILE
|
||||
bool 'Support postgres95 SQL-Database' CONFIG_ISDNLOG_POSTGRES
|
||||
if [ "$CONFIG_ISDNLOG_POSTGRES" = "y" ]; then
|
||||
string 'directory of postgres95' CONFIG_ISDNLOG_POSTGRESDIR
|
||||
fi
|
||||
bool 'Support for old isdn4linux' CONFIG_ISDNLOG_OLD_I4L
|
||||
choice 'Country specific chargeinfo support' \
|
||||
"DE CONFIG_ISDNLOG_DE \
|
||||
NL CONFIG_ISDNLOG_NL \
|
||||
CH CONFIG_ISDNLOG_CH" DE
|
||||
CH CONFIG_ISDNLOG_CH"
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -21,26 +21,26 @@ comment 'General configuration'
|
|||
comment 'Build options'
|
||||
dep_bool 'Build programs which need X11 installed' CONFIG_BUILDX11 $CONFIG_HASX11
|
||||
comment 'Destination directories'
|
||||
string 'Directory to install binaries' CONFIG_BINDIR /usr/bin
|
||||
string 'Directory to install admin binaries' CONFIG_SBINDIR /sbin
|
||||
string 'Directory to install man pages' CONFIG_MANDIR /usr/man
|
||||
string 'Directory to install binaries' CONFIG_BINDIR
|
||||
string 'Directory to install admin binaries' CONFIG_SBINDIR
|
||||
string 'Directory to install man pages' CONFIG_MANDIR
|
||||
comment 'Runtime defaults'
|
||||
string 'Write .pid files here' CONFIG_RUNDIR /var/run
|
||||
string 'General configuration directory' CONFIG_I4LCONFDIR /etc/isdn
|
||||
string 'Global configuration file' CONFIG_CONFFILE isdn.conf
|
||||
string 'Global phone number file file' CONFIG_CALLERIDFILE callerid.conf
|
||||
string 'User configuration file' CONFIG_USERCONFFILE ~/.isdn
|
||||
string 'Write .pid files here' CONFIG_RUNDIR
|
||||
string 'General configuration directory' CONFIG_I4LCONFDIR
|
||||
string 'Global configuration file' CONFIG_CONFFILE
|
||||
string 'Global phone number file file' CONFIG_CALLERIDFILE
|
||||
string 'User configuration file' CONFIG_USERCONFFILE
|
||||
comment 'Configuration library options'
|
||||
string 'Default country prefix' CONFIG_COUNTRY_PREFIX +
|
||||
string 'Default area prefix' CONFIG_AREA_PREFIX 0
|
||||
string 'Default country prefix' CONFIG_COUNTRY_PREFIX
|
||||
string 'Default area prefix' CONFIG_AREA_PREFIX
|
||||
choice 'Database for area codes' \
|
||||
"Areacode CONFIG_LIB_AREACODE \
|
||||
Avon CONFIG_LIB_AVON" Areacode
|
||||
Avon CONFIG_LIB_AVON"
|
||||
if [ "$CONFIG_LIB_AREACODE" = "y" ]; then
|
||||
string 'Directory to install areacodes' CONFIG_AREACODE_DATA /usr/lib/isdn
|
||||
string 'Directory to install areacodes' CONFIG_AREACODE_DATA
|
||||
fi
|
||||
if [ "$CONFIG_LIB_AVON" = "y" ]; then
|
||||
string 'Directory to install avon database' CONFIG_AVON_DATA /usr/lib/isdn
|
||||
string 'Directory to install avon database' CONFIG_AVON_DATA
|
||||
fi
|
||||
endmenu
|
||||
mainmenu_option nextcomment
|
||||
|
|
@ -64,7 +64,7 @@ bool 'avmcapictrl' CONFIG_AVMCAPICTRL
|
|||
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
|
||||
bool 'loopctrl' CONFIG_LOOPCTRL
|
||||
if [ "$CONFIG_LOOPCTRL" = "y" ]; then
|
||||
string 'Sourcedir of isdnloop module' CONFIG_LOOPCTRL_LOOPDIR '\~/isdn/drivers/isdn/isdnloop'
|
||||
string 'Sourcedir of isdnloop module' CONFIG_LOOPCTRL_LOOPDIR
|
||||
bool 'Enable loopctrl debug-option' CONFIG_LOOPCTRL_DEBUG
|
||||
fi
|
||||
fi
|
||||
|
|
@ -84,8 +84,8 @@ dep_bool 'xmonisdn' CONFIG_XMONISDN $CONFIG_BUILDX11
|
|||
if [ "$CONFIG_XMONISDN" = "y" ] ; then
|
||||
mainmenu_option nextcomment
|
||||
comment 'Options for xmonisdn'
|
||||
string 'NetUP command' CONFIG_XMONISDN_UPCMD '/sbin/netup'
|
||||
string 'NetDOWN command' CONFIG_XMONISDN_DOWNCMD '/sbin/netdown'
|
||||
string 'NetUP command' CONFIG_XMONISDN_UPCMD
|
||||
string 'NetDOWN command' CONFIG_XMONISDN_DOWNCMD
|
||||
endmenu
|
||||
fi
|
||||
endmenu
|
||||
|
|
@ -105,6 +105,6 @@ comment 'Documentation'
|
|||
bool 'Install generic pages' CONFIG_GENMAN
|
||||
bool 'Generate FAQ' CONFIG_FAQ
|
||||
if [ "$CONFIG_FAQ" = "y" ]; then
|
||||
string 'Directory to install FAQ' CONFIG_FAQDIR /usr/doc/faq/isdn4linux
|
||||
string 'Directory to install FAQ' CONFIG_FAQDIR
|
||||
fi
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#
|
||||
# Code maturity level options
|
||||
#
|
||||
# CONFIG_EXPERIMENTAL is not set
|
||||
CONFIG_EXPERIMENTAL=n
|
||||
|
||||
#
|
||||
# General configuration
|
||||
|
|
@ -40,6 +40,9 @@ CONFIG_ICNCTRL=y
|
|||
# CONFIG_ICNCTRL_DEBUG is not set
|
||||
CONFIG_PCBITCTL=y
|
||||
CONFIG_AVMCAPICTRL=y
|
||||
CONFIG_LOOPCTRL=n
|
||||
CONFIG_LOOPCTRL_LOOPDIR='~/isdn/drivers/isdn/isdnloop'
|
||||
# CONFIG_LOOPCTRL_DEBUG is not set
|
||||
|
||||
#
|
||||
# Tools for monitoring activity
|
||||
|
|
@ -60,7 +63,8 @@ CONFIG_ISDNLOG_STOPCMD='stop'
|
|||
CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
|
||||
CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
|
||||
CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
|
||||
# CONFIG_ISDNLOG_POSTGRES is not set
|
||||
CONFIG_ISDNLOG_POSTGRES=y
|
||||
CONFIG_ISDNLOG_POSTGRESDIR='/usr/local/postgres95'
|
||||
# CONFIG_ISDNLOG_OLD_I4L is not set
|
||||
CONFIG_ISDNLOG_DE=y
|
||||
CONFIG_IPPPSTATS=y
|
||||
|
|
@ -76,7 +80,16 @@ CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
|
|||
#
|
||||
# Applications
|
||||
#
|
||||
# CONFIG_VBOX is not set
|
||||
CONFIG_VBOX=n
|
||||
|
||||
#
|
||||
# Options for vbox package
|
||||
#
|
||||
VBOX_SPOOLDIR='/var/spool/vbox'
|
||||
VBOX_LOGDIR='/var/log/vbox'
|
||||
VBOX_PIDDIR='/var/run'
|
||||
VBOX_LOCKDIR='/var/lock'
|
||||
VBOX_TCL='tcl8.0'
|
||||
CONFIG_IPPPD=y
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
mainmenu_option next_comment
|
||||
comment 'Options for vbox package'
|
||||
string 'Voice message spool directory' VBOX_SPOOLDIR '/var/spool/vbox'
|
||||
string 'Log directory' VBOX_LOGDIR '/var/log/vbox'
|
||||
string 'PID directory' VBOX_PIDDIR '/var/run'
|
||||
string 'Lock directory' VBOX_LOCKDIR '/var/lock'
|
||||
string 'Version of Tcl library to use' VBOX_TCL 'tcl8.0'
|
||||
string 'Voice message spool directory' VBOX_SPOOLDIR
|
||||
string 'Log directory' VBOX_LOGDIR
|
||||
string 'PID directory' VBOX_PIDDIR
|
||||
string 'Lock directory' VBOX_LOCKDIR
|
||||
string 'Version of Tcl library to use' VBOX_TCL
|
||||
endmenu
|
||||
|
|
|
|||
Loading…
Reference in New Issue