Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Move -DDFAULT_SQUID_DATA_DIR & CONFIG_DIR from CFLAGS to DEFS

For some reason gcc on OpenBSD does not like having these in CFLAGS
when running configure. However works fine having them expanded in
src/Makefile DEFS variable just like -DDEFAULT_SQUID_CONFIG_FILE

diff --git a/configure.in b/configure.in
index b56756c98cafcd40ee5d5acf9019813b26219692..9bf9eca5c677ccd8dc671acadd08da22cd1713f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,14 +27,6 @@ AC_PROG_CXX
 AC_LANG_CPLUSPLUS
 AC_CANONICAL_HOST
 
-dnl Make location configure settings available to the code
-dnl Pass squid data directory (icons, errors etc)  base location to code files as a compiler define
-CFLAGS="-DDEFAULT_SQUID_DATA_DIR=\\\"$datadir\\\" $CFLAGS"
-CXXFLAGS="-DDEFAULT_SQUID_DATA_DIR=\\\"$datadir\\\" $CXXFLAGS"
-dnl Pass squid.conf directory base location to code files as a compiler define
-CFLAGS="-DDEFAULT_SQUID_CONFIG_DIR=\\\"$sysconfdir\\\" $CFLAGS"
-CXXFLAGS="-DDEFAULT_SQUID_CONFIG_DIR=\\\"$sysconfdir\\\" $CXXFLAGS"
-
 dnl Make the squid top srcdir available to sub-packages as --with-squid=PATH
 new_configure_args="$ac_configure_args --with-squid=$ac_abs_confdir"
 ac_configure_args="$new_configure_args"

diff --git a/src/Makefile.am b/src/Makefile.am
index 45e247e4ec8d5bee27873864a86a6d82dc9d7754..357d44a4bda50f58251c6abc9d39fdf5547cf1c4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1022,9 +1022,9 @@ DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
 DEFAULT_HTTP_PORT      = @CACHE_HTTP_PORT@
 DEFAULT_ICP_PORT       = @CACHE_ICP_PORT@
 DEFAULT_PREFIX         = $(prefix)
-DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
 DEFAULT_CONFIG_DIR     = $(sysconfdir)
-DEFAULT_MIME_TABLE     = $(sysconfdir)/mime.conf
+DEFAULT_CONFIG_FILE     = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE     = $(DEFAULT_CONFIG_DIR)/mime.conf
 DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX     = @DEFAULT_LOG_DIR@
 DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -1041,7 +1041,8 @@ DEFAULT_ERROR_DIR = $(datadir)/errors
 DEFAULT_MIB_PATH       = $(datadir)/mib.txt
 DEFAULT_HOSTS          = @OPT_DEFAULT_HOSTS@
 
-DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
+# Make location configure settings available to the code
+DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
 
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h