From: Nishi <nishi@nishi.boats>
Date: Wed, 18 Sep 2024 09:37:09 +0000 (+0000)
Subject: fix strptime
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=1750ab068dfcbe52798b471bb015f2ea564a6b9f;p=tewi.git

fix strptime

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

diff --git a/Makefile b/Makefile
index 3caeb4c..d8d3767 100644
--- 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 3bffd0f..78109d9 100644
--- 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 b756c58..7c99294 100644
--- 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 ce0f05d..c10ccf8 100644
--- 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;