From: Art Cancro <ajc@citadel.org>
Date: Mon, 29 Mar 2004 04:30:20 +0000 (+0000)
Subject: * configure.in, Makefile.in: handle $LDFLAGS
X-Git-Tag: v7.86~5490
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=6512fea76957ef1f2b906b109af2f83eeaf3b3cc;p=citadel.git

* configure.in, Makefile.in: handle $LDFLAGS
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 74e7fa141..d5d14db7e 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 505.21  2004/03/29 04:30:20  ajc
+* configure.in, Makefile.in: handle $LDFLAGS
+
 Revision 505.20  2004/03/20 05:03:14  ajc
 * Original startup thread becomes a worker thread after initialization.
   Doing otherwise turns it into a zombie (at least on Linux) and possibly
@@ -1746,3 +1749,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
+
diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index efb52db2b..90d59eff2 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -6,6 +6,7 @@ CFLAGS=@CFLAGS@
 DEFS=@DEFS@
 LIBOBJS=@LIBOBJS@
 LIBS=@LIBS@
+LDFLAGS=@LDFLAGS@
 SETUP_LIBS=@SETUP_LIBS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
 srcdir=@srcdir@
@@ -23,7 +24,8 @@ distclean: clean
 	rm -f Makefile config.cache config.log config.status
 
 setup: setup.o tools.o
-	$(CC) setup.o tools.o  $(LIBOBJS) $(LIBS) $(SETUP_LIBS) -o setup
+	$(CC) setup.o tools.o \
+	$(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
 
 webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	cookie_conversion.o locate_host.o floors.o summary.o \
@@ -41,7 +43,7 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	mime_parser.o graphics.o netconf.o preferences.o html2html.o \
 	summary.o calendar.o calendar_tools.o calendar_view.o event.o \
 	availability.o ical_dezonify.o iconbar.o \
-	$(LIBOBJS) $(LIBS) -o webserver
+	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
 	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"`pwd`\" $<