[svn] GnuPG - r3976 - trunk/util

[svn author dshaw]

Author: dshaw
Date: 2005-12-23 06:00:55 +0100 (Fri, 23 Dec 2005)
New Revision: 3976

Modified:
   trunk/util/ChangeLog
   trunk/util/Makefile.am
   trunk/util/srv.c
Log:
* srv.c, Makefile.am: Only build srv.c if we need to.


Modified: trunk/util/ChangeLog
===================================================================
--- trunk/util/ChangeLog	2005-12-23 04:58:25 UTC (rev 3975)
+++ trunk/util/ChangeLog	2005-12-23 05:00:55 UTC (rev 3976)
@@ -1,3 +1,7 @@
+2005-12-22  David Shaw  <dshaw at jabberwocky.com>
+
+	* srv.c, Makefile.am: Only build srv.c if we need to.
+
 2005-12-10  Ryan Lortie  <desrt at desrt.ca> (dshaw)
 
 	* ttyio.c (tty_enable_completion, tty_disable_completion): Add

Modified: trunk/util/Makefile.am
===================================================================
--- trunk/util/Makefile.am	2005-12-23 04:58:25 UTC (rev 3975)
+++ trunk/util/Makefile.am	2005-12-23 05:00:55 UTC (rev 3976)
@@ -24,7 +24,7 @@
 
 libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \
 		    ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \
-		    dotlock.c http.c srv.h srv.c pka.c membuf.c
+		    dotlock.c http.c pka.c membuf.c
 
 if USE_SIMPLE_GETTEXT
 libutil_a_SOURCES+=simple-gettext.c
@@ -44,6 +44,10 @@
 libutil_a_SOURCES+=regex.c
 endif
 
+if USE_DNS_SRV
+libutil_a_SOURCES+=srv.c srv.h
+endif
+
 # The internal regex code #includes these.
 EXTRA_libutil_a_SOURCES = regcomp.c regexec.c regex_internal.c \
 	                  regex_internal.h

Modified: trunk/util/srv.c
===================================================================
--- trunk/util/srv.c	2005-12-23 04:58:25 UTC (rev 3975)
+++ trunk/util/srv.c	2005-12-23 05:00:55 UTC (rev 3976)
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#ifdef USE_DNS_SRV
 #include <sys/types.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -226,8 +225,6 @@
   return -1;
 }
 
-#endif /* USE_DNS_SRV */
-
 #ifdef TEST
 int
 main(int argc,char *argv[])