fix strptime

git-svn-id: file:///raid/svn-personal/tewi/trunk@44 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Makefile b/Makefile
index 3caeb4cacc4f988399061f8fc6e711a1a4bc0c02..d8d376718b6129d28ff88ddff4b4f9a6c2d98314 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ all: ./Server ./Module ./Manpage
        cc -o $@ ./Server/option.c
 
 ./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
        $(MAKE) -C $@ $(FLAGS)

diff --git a/Server/Makefile b/Server/Makefile
index 3bffd0f429b9a40a4635ea3e89a70b47a6cdb2f4..78109d947e1184fba35d5fa2eb1b579982d0e763 100644 (file)
--- a/Server/Makefile
+++ b/Server/Makefile
@@ -10,10 +10,10 @@ OBJS = version.o main.o config.o server.o http.o module.o strptime.o $(EXTOBJS)
 all: tewi$(EXEC)
 
 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:
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) $(EXTCFLAGS) -c -o $@ $<
 
 clean:
        rm -f *.o tewi *.exe

diff --git a/Server/option.c b/Server/option.c
index b756c586a714a78d3e43f0a23dac1fd4d0610337..7c99294edd574ca48482d49d40f24b754b47360c 100644 (file)
--- a/Server/option.c
+++ b/Server/option.c
@@ -16,7 +16,7 @@ int main(int argc, char** argv) {
 #endif
        } else if(strcmp(argv[1], "ldflags") == 0) {
 #ifndef NO_SSL
-               printf("-I %s/openssl/lib", argv[2]);
+               printf("-L %s/openssl/lib", argv[2]);
 #endif
        } else if(strcmp(argv[1], "objs") == 0) {
 #ifndef NO_SSL

diff --git a/Server/strptime.c b/Server/strptime.c
index ce0f05d822e8b2f14e89b99e9269c9357939622b..c10ccf8fb783befe25020542f4be9f72d578b7e9 100644 (file)
--- a/Server/strptime.c
+++ b/Server/strptime.c
@@ -635,7 +635,7 @@ namedzone:
                  * Our current timezone
                  */
                 ep = find_string(bp, &i,
-                             (const char * const *)tzname,
+                             (const char * const *)NULL,
                               NULL, 2);
                 if (ep != NULL) {
                     tm->tm_isdst = i;