fix strptime
git-svn-id: file:///raid/svn-personal/tewi/trunk@44 8739d7e6-ffea-ec47-b151-bdff447c6205
This commit is contained in:
parent
4d8bc89134
commit
1750ab068d
2
Makefile
2
Makefile
|
@ -16,7 +16,7 @@ all: ./Server ./Module ./Manpage
|
||||||
cc -o $@ ./Server/option.c
|
cc -o $@ ./Server/option.c
|
||||||
|
|
||||||
./Server:: ./Common ./Server/option
|
./Server:: ./Common ./Server/option
|
||||||
$(MAKE) -C $@ $(FLAGS) EXTOBJS=`./Server/option objs ../` EXTLIBS=`./Server/option libs ../`
|
$(MAKE) -C $@ $(FLAGS) EXTOBJS="`./Server/option objs ../`" EXTLIBS="`./Server/option libs ../`" EXTCFLAGS="`./Server/option cflags ../`" EXTLDFLAGS="`./Server/option ldflags ../`"
|
||||||
|
|
||||||
./Module:: ./Common
|
./Module:: ./Common
|
||||||
$(MAKE) -C $@ $(FLAGS)
|
$(MAKE) -C $@ $(FLAGS)
|
||||||
|
|
|
@ -10,10 +10,10 @@ OBJS = version.o main.o config.o server.o http.o module.o strptime.o $(EXTOBJS)
|
||||||
all: tewi$(EXEC)
|
all: tewi$(EXEC)
|
||||||
|
|
||||||
tewi$(EXEC): $(OBJS) ../Common/common.a
|
tewi$(EXEC): $(OBJS) ../Common/common.a
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTLIBS) $(LIBS) ../Common/common.a
|
$(CC) $(LDFLAGS) $(EXTLDFLAGS) -o $@ $(OBJS) $(EXTLIBS) $(LIBS) ../Common/common.a
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) $(EXTCFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o tewi *.exe
|
rm -f *.o tewi *.exe
|
||||||
|
|
|
@ -16,7 +16,7 @@ int main(int argc, char** argv) {
|
||||||
#endif
|
#endif
|
||||||
} else if(strcmp(argv[1], "ldflags") == 0) {
|
} else if(strcmp(argv[1], "ldflags") == 0) {
|
||||||
#ifndef NO_SSL
|
#ifndef NO_SSL
|
||||||
printf("-I %s/openssl/lib", argv[2]);
|
printf("-L %s/openssl/lib", argv[2]);
|
||||||
#endif
|
#endif
|
||||||
} else if(strcmp(argv[1], "objs") == 0) {
|
} else if(strcmp(argv[1], "objs") == 0) {
|
||||||
#ifndef NO_SSL
|
#ifndef NO_SSL
|
||||||
|
|
|
@ -635,7 +635,7 @@ namedzone:
|
||||||
* Our current timezone
|
* Our current timezone
|
||||||
*/
|
*/
|
||||||
ep = find_string(bp, &i,
|
ep = find_string(bp, &i,
|
||||||
(const char * const *)tzname,
|
(const char * const *)NULL,
|
||||||
NULL, 2);
|
NULL, 2);
|
||||||
if (ep != NULL) {
|
if (ep != NULL) {
|
||||||
tm->tm_isdst = i;
|
tm->tm_isdst = i;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user