|
Lines 1-63
Link Here
|
| 1 |
This patch is mostly a patch for Squid bug #2346; the default location of the |
|
|
| 2 |
cachemgr.cgi configuration file was not correctly passed to the preprocessor |
| 3 |
during compilation. |
| 4 |
|
| 5 |
--- tools/Makefile.in.orig 2008-05-10 16:54:15.000000000 +0200 |
| 6 |
+++ tools/Makefile.in 2008-05-10 16:56:22.000000000 +0200 |
| 7 |
@@ -61,7 +61,7 @@ |
| 8 |
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) |
| 9 |
libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) |
| 10 |
PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) |
| 11 |
-am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT) |
| 12 |
+am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT) |
| 13 |
cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS) |
| 14 |
cachemgr__CGIEXT__LDADD = $(LDADD) |
| 15 |
am__DEPENDENCIES_1 = |
| 16 |
@@ -318,7 +318,7 @@ |
| 17 |
SUBDIRS = |
| 18 |
squidclient_SOURCES = squidclient.cc |
| 19 |
cachemgr__CGIEXT__SOURCES = cachemgr.cc |
| 20 |
-cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS) |
| 21 |
+cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS) |
| 22 |
LDADD = -L../lib -lmiscutil $(XTRA_LIBS) |
| 23 |
EXTRA_DIST = \ |
| 24 |
cachemgr.conf |
| 25 |
@@ -440,7 +440,7 @@ |
| 26 |
distclean-compile: |
| 27 |
-rm -f *.tab.c |
| 28 |
|
| 29 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr.Po@am__quote@ |
| 30 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po@am__quote@ |
| 31 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squidclient.Po@am__quote@ |
| 32 |
|
| 33 |
.cc.o: |
| 34 |
@@ -467,6 +467,20 @@ |
| 35 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| 36 |
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< |
| 37 |
|
| 38 |
+cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc |
| 39 |
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc; \ |
| 40 |
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi |
| 41 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@ |
| 42 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| 43 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc |
| 44 |
+ |
| 45 |
+cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc |
| 46 |
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`; \ |
| 47 |
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi |
| 48 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@ |
| 49 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| 50 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` |
| 51 |
+ |
| 52 |
mostlyclean-libtool: |
| 53 |
-rm -f *.lo |
| 54 |
|
| 55 |
@@ -835,6 +849,8 @@ |
| 56 |
$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h |
| 57 |
|
| 58 |
install-data-local: |
| 59 |
+ @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \ |
| 60 |
+ $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; |
| 61 |
@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \ |
| 62 |
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \ |
| 63 |
else \ |