Changeset 3632
- Timestamp:
- 2002-12-20T11:56:51+13:00 (21 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 7 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/etc/main.cfg
r3220 r3632 74 74 spanish.dm spanish2.dm dutch.dm port.dm russian.dm russian2.dm \ 75 75 italian.dm italian2.dm turkish.dm turkish2.dm \ 76 home.dm collect.dm docs.dm hebrew.dm indo.dm bsummary.dm 76 home.dm collect.dm docs.dm hebrew.dm indo.dm bsummary.dm \ 77 translang.dm 77 78 78 79 # Define the interface languages and encodings supported by this receptionist -
trunk/gsdl/src/recpt/Makefile.in
r3322 r3632 39 39 endif 40 40 41 42 43 41 AR = ar 44 42 CC = @CC@ … … 51 49 YAZDIR=../../packages/yaz 52 50 51 USE_LANGACTION = @USE_LANGACTION@ 52 ifneq ($(USE_LANGACTION), 1) 53 LANGACTION_DEFS= 54 else 55 LANGACTION_DEFS=-DUSE_LANGACTION 56 endif 57 58 53 59 USE_FASTCGI = @USE_FASTCGI@ 54 60 ifneq ($(USE_FASTCGI), 1) 55 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@ 61 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@ $(LANGACTION_DEFS) 56 62 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \ 57 63 -I../../packages/mg/lib -I../../packages/mg/src/text \ 58 64 -I../mgpp/lib -I../mgpp/text -I../.. 59 65 else 60 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@ 66 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@ $(LANGACTION_DEFS) 61 67 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \ 62 68 -I../../packages/mg/lib -I../../packages/mg/src/text \ … … 128 134 .mpp.o: 129 135 $(MCOMPILE) $< -o $@ 136 137 ifeq ($(USE_LANGACTION), 1) 138 LANG_HEADERS=langaction.h langdb.h 139 else 140 LANG_HEADERS= 141 endif 130 142 131 143 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \ … … 138 150 datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \ 139 151 htmlbrowserclass.h phindbrowserclass.h historydb.h collectoraction.h \ 140 phindaction.h summarise.h highlighttext.h 152 phindaction.h summarise.h highlighttext.h $(LANG_HEADERS) 141 153 142 154 RECEPTHEADERS = … … 150 162 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS) 151 163 164 ifeq ($(USE_LANGACTION), 1) 165 LANG_SOURCES= langaction.cpp langdb.cpp 166 else 167 LANG_SOURCES= 168 endif 152 169 153 170 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \ … … 161 178 phindbrowserclass.cpp historydb.cpp collectoraction.cpp argdb.cpp \ 162 179 browseactiontools.h formattools.cpp phindaction.cpp summarise.cpp \ 163 highlighttext.cpp 180 highlighttext.cpp $(LANG_SOURCES) 164 181 165 182 … … 174 191 LIBRARYSOURCES = nullproto.cpp librarymain.cpp $(Z_LIBSOURCES) 175 192 176 SOURCES = $(COMMONSOURCES) $( RECPTSOURCES) $(LIBRARYSOURCES)193 SOURCES = $(COMMONSOURCES) $(LANG_SOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES) 177 194 178 195 … … 181 198 else 182 199 Z_COMOBJS= 200 endif 201 202 ifeq ($(USE_LANGACTION), 1) 203 LANG_OBJECTS= langaction.o langdb.o 204 else 205 LANG_OBJECTS= 183 206 endif 184 207 … … 193 216 pagedbrowserclass.o htmlbrowserclass.o phindbrowserclass.o \ 194 217 historydb.o $(Z_COMOBJS) collectoraction.o phindaction.o \ 195 summarise.o highlighttext.o 218 summarise.o highlighttext.o $(LANG_OBJECTS) 196 219 197 220 RECPTOBJECTS = recptmain.o -
trunk/gsdl/src/recpt/librarymain.cpp
r2572 r3632 57 57 #include "browseaction.h" 58 58 #include "phindaction.h" 59 #if defined(USE_LANGACTION) 60 #include "langaction.h" 61 #endif 59 62 60 63 #include "browserclass.h" … … 155 158 recpt.add_action(&aphindaction); 156 159 160 #if defined(USE_LANGACTION) 161 langaction alangaction; 162 recpt.add_action(&alangaction); 163 #endif 164 157 165 // list of browsers 158 166 vlistbrowserclass avlistbrowserclass;
Note:
See TracChangeset
for help on using the changeset viewer.