Changeset 19259
- Timestamp:
- 2009-04-25T18:45:58+12:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/src/recpt
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/recpt/Makefile.in
r18612 r19259 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 29 RUNTIME_DIR = $(GSDL_DIR)/runtime-src 30 31 GSDLOS = @gsdlos@ 30 32 31 33 INDEXERS_DIR = $(COMMON_DIR)/indexers … … 71 73 Z3950_INCLUDES = 72 74 Z3950_LIBS = 75 endif 76 77 USE_APACHE_HTTPD=@USE_APACHE_HTTPD@ 78 ifeq ($(USE_APACHE_HTTPD), 1) 79 APACHE_OBJS = string_pool.o mod_gsdl.o 80 81 APXS=$(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs 82 APXS_CFLAGS=`$(APXS) -q CFLAGS` 83 APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB` 84 APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR` 85 APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR` 86 APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB` 87 APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR` 88 APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB` 89 APACHE_MODULE = mod_gsdl.so 90 else 91 APACHE_OBJS = 92 APACHE_MODULE = mod_gsdl.so 73 93 endif 74 94 … … 95 115 96 116 97 .SUFFIXES:98 .SUFFIXES: .cpp .o99 .cpp.o:100 $(CXXCOMPILE) $<101 102 103 117 SOURCES = \ 104 118 action.cpp \ … … 113 127 cgiwrapper.cpp \ 114 128 collectoraction.cpp \ 129 configaction.cpp \ 115 130 converter.cpp \ 116 131 datelistbrowserclass.cpp \ … … 157 172 cgiwrapper.o \ 158 173 collectoraction.o \ 174 configaction.o \ 159 175 converter.o \ 160 176 datelistbrowserclass.o \ … … 187 203 usersaction.o \ 188 204 vlistbrowserclass.o \ 189 wizardaction.o 205 wizardaction.o 190 206 191 207 LIBRARY = gsdlrecpt.a … … 208 224 209 225 # Default target: make both gsdlrecpt.a and the library executable 210 all: $(LIBRARY) $(EXECUTABLE) 226 all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) 211 227 212 228 gsdlrecpt.a: $(OBJECTS) … … 218 234 $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS) 219 235 236 mod_gsdl.o: mod_gsdl.cpp 237 $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC -I$(APXS_INCLUDEDIR) -I. -iquote $(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -Wall -o $@ $< 238 239 mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY) 240 $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(APXS_LIBS_SHLIB) $(LIBRARY) $(GSDL_LIBS) $(LIBS) 241 242 243 .SUFFIXES: 244 .SUFFIXES: .cpp .o 245 .cpp.o: 246 $(CXXCOMPILE) $< 247 248 220 249 install: $(EXECUTABLE) 221 250 $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/cgi-bin 251 $(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs -i -n gsdl mod_gsdl.so 222 252 223 253 clean: 224 rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) 254 rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) $(APACHE_OBJS) 225 255 226 256 distclean: -
gsdl/trunk/runtime-src/src/recpt/receptionist.cpp
r19109 r19259 1448 1448 } 1449 1449 1450 1450 1451 void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/, 1451 1452 ostream &logout) { … … 1457 1458 disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb); 1458 1459 disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix); 1459 1460 1460 1461 1461 text_t compressedoptions = get_compressed_arg(args, logout); … … 1559 1559 } 1560 1560 } 1561 1561 1562 1562 if (!collection.empty()) { 1563 1563 ColInfoResponse_t cinfo; … … 1566 1566 if (collectproto != NULL) { 1567 1567 collectproto->get_collectinfo (collection, cinfo, err, logout); 1568 1569 1570 // This part of the code used to use "cinfo.httpprefix" regardless 1571 // of the value it contained. Since 1572 // this can come back with an empty (in the case of gsdl_mod), the 1573 // URL produced was invalid. 1574 // 1575 // Changed to test for empty first, and use configinfo.httpprefix as 1576 // a "backup" 1577 // 1578 // Point to consider: since configinfo.httpprefix has been offically 1579 // set as "httpprefix" in macros, it seems to make more sense to use 1580 // always use that version and not the cinfo version at all. 1581 1582 text_t httpprefix 1583 = (!cinfo.httpprefix.empty()) ? cinfo.httpprefix : configinfo.httpprefix; 1584 1568 1585 text_t httpcollection; 1569 1586 if (!cinfo.httpdomain.empty()) httpcollection = "http://"; 1570 httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"1587 httpcollection += cinfo.httpdomain + httpprefix + "/collect/" 1571 1588 + collection; 1572 1589 disp.setmacro ("httpcollection", displayclass::defaultpackage, 1573 1590 httpcollection); 1591 1574 1592 // as of gsdl 2.53, collect.cfg can specify macros 1575 1593 if (cinfo.collection_macros.size() > 0) {
Note:
See TracChangeset
for help on using the changeset viewer.