From 26c7e0d22ead805ce333ea4248c7311c1eda5de0 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 21 Sep 2008 08:57:51 +0200 Subject: Finished autoconf. -> Commments are welcome. deleted: Makefile modified: Makefile.am new file: Makefile.in modified: README new file: aclocal.m4 modified: action_vbox.cpp modified: alawulaw.h modified: autogen.sh new file: config.h.in new file: configure modified: configure.ac modified: default/interface.conf modified: default/options.conf modified: dss1.cpp modified: dss1.h modified: extension.c modified: genext.c modified: interface.c modified: interface.h modified: mISDN.cpp modified: mISDN.h modified: main.h new file: mkinstalldirs modified: options.c modified: options.h modified: port.cpp modified: route.c modified: todo.txt modified: tones.c modified: vbox.cpp deleted: watch.c --- options.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'options.c') diff --git a/options.c b/options.c index fbe7fea..160a8a8 100644 --- a/options.c +++ b/options.c @@ -26,7 +26,6 @@ struct options options = { "00", /* international prefix */ "tones_american", /* directory of tones */ "", /* directories of tones to fetch */ - "extensions", /* directory of extensions */ "", /* dummy caller id */ 0, /* use tones by dsp.o */ 0, /* by default use priority 0 */ @@ -51,7 +50,7 @@ int read_options(void) unsigned int line,i; char buffer[256]; - SPRINT(filename, "%s/options.conf", INSTALL_DATA); + SPRINT(filename, "%s/options.conf", CONFIG_DATA); if (!(fp=fopen(filename,"r"))) { @@ -176,15 +175,7 @@ int read_options(void) } else if (!strcmp(option,"extensions_dir")) { - if (param[0]==0) - { - SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option); - goto error; - } - if (param[strlen(param)-1] == '/') - param[strlen(param)-1]=0; - SCPY(options.extensions_dir, param); - + // obsolete } else if (!strcmp(option,"national")) { -- cgit v1.2.3-55-g7522