Move -DDFAULT_SQUID_DATA_DIR & CONFIG_DIR from CFLAGS to DEFS

diff --cc configure.in
index 4973fd0fb5bae6f8465ab498696942edd4ae1e4d,373fac191cacf5d86a5f4a28d6f52e96c6936c5a..36f5d9f0b72f46b92ef0b203eb45d553bfb64e7b
--- 1/configure.in
--- 2/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"

diff --cc src/Makefile.am
Simple merge