From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 2 Feb 2009 12:33:27 +0000 (+0100)
Subject: Move -DDFAULT_SQUID_DATA_DIR & CONFIG_DIR from CFLAGS to DEFS
X-Git-Tag: SQUID_3_2_0_1~1226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=978273c87fcd4eaab87b49f29c78e4cf3f83dc7d;p=thirdparty%2Fsquid.git

Move -DDFAULT_SQUID_DATA_DIR & CONFIG_DIR from CFLAGS to DEFS
---

978273c87fcd4eaab87b49f29c78e4cf3f83dc7d
diff --cc configure.in
index 4973fd0fb5,373fac191c..36f5d9f0b7
--- a/configure.in
+++ b/configure.in
@@@ -26,18 -26,10 +26,10 @@@ f
  dnl Check for GNU cc
  AC_PROG_CC
  AM_PROG_CC_C_O
 -AC_LANG_C
  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"