diff options
| author | Mukund Sivaraman <muks@banu.com> | 2009-09-20 12:33:47 +0530 |
|---|---|---|
| committer | Mukund Sivaraman <muks@banu.com> | 2009-09-20 12:33:47 +0530 |
| commit | 90e7d07f447f3abeb60720529d2b12ee91c4926e (patch) | |
| tree | 12014b44d3c1834c9bdd5753f30b59891a1ad469 /configure.ac | |
| parent | 6f9fa5287f169cd86277d2c41d20dbaa18e9cf19 (diff) | |
Remove ability to change the name of the default configuration file
This feature will only confuse us during support, if users come to
us with a Tinyproxy build which has a differently named default config
file. This feature is not that useful anyway.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index c126106..c886176 100644 --- a/configure.ac +++ b/configure.ac @@ -76,32 +76,6 @@ AC_ARG_WITH(stathost, dnl Set the default configuration file location test "$prefix" = "NONE" && prefix=/usr/local -AH_TEMPLATE([DEFAULT_CONF_FILE], - [This is the default file name for the configuration file.]) -AC_ARG_WITH(config, - [AC_HELP_STRING([--with-config=FILE], - [Set the default location of the config file])], - [tp_config_file="$withval"], - [tp_config_file="tinyproxy.conf"]) - -# If the first character is a slash, it's an absolute path -if [[ `echo $tp_config_file | cut -c1` = "/" ]]; then - TINYPROXY_CONFIG_DIR=`echo "$tp_config_file" | sed 's/^\(.*\)\/[[^\/]]*$/\1/'` - TINYPROXY_CONFIG_FILE=`echo "$tp_config_file" | sed 's/^.*\/\([[^\/]]*\)$/\1/'` -else - # If sysconfdir is /usr/etc, change it to /etc (since /usr/etc doesn't exist) - if [[ "/usr/etc" = `eval echo $sysconfdir` -a "/usr" = "$prefix" ]]; then - TINYPROXY_CONFIG_DIR="/etc/tinyproxy" - else - TINYPROXY_CONFIG_DIR=`eval echo $sysconfdir/tinyproxy` - fi - TINYPROXY_CONFIG_FILE="$tp_config_file" -fi - -AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "$TINYPROXY_CONFIG_DIR/$TINYPROXY_CONFIG_FILE") - -AC_MSG_NOTICE([Default config location and file is: $TINYPROXY_CONFIG_DIR/$TINYPROXY_CONFIG_FILE]) - dnl Add compiler-specific optimization flags TP_ARG_ENABLE(debug, [Enable debugging support code and methods (default is NO)], @@ -343,8 +317,6 @@ AC_SUBST(LDFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LIBS) AC_SUBST(ADDITIONAL_OBJECTS) -AC_SUBST(TINYPROXY_CONFIG_DIR) -AC_SUBST(TINYPROXY_CONFIG_FILE) # Check for asciidoc AC_PATH_PROG(A2X, a2x, no) |