diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/main.c | 2 |
4 files changed, 4 insertions, 31 deletions
@@ -46,8 +46,6 @@ INSTALLATION Options for file locations etc. --with-stathost=HOST Set the default name of the stats host - --with-config=FILE Set the default location of the - configuration file SUPPORT 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) diff --git a/src/Makefile.am b/src/Makefile.am index 2d11ddc..05b5bb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,9 @@ sbin_PROGRAMS = tinyproxy +AM_CPPFLAGS = \ + -DSYSCONFDIR=\"${sysconfdir}\" + tinyproxy_SOURCES = \ acl.c acl.h \ anonymous.c anonymous.h \ @@ -287,7 +287,7 @@ main (int argc, char **argv) */ umask (0177); - config.config_file = DEFAULT_CONF_FILE; + config.config_file = SYSCONFDIR "/tinyproxy.conf"; config.godaemon = TRUE; process_cmdline (argc, argv); |