From 5e08b08da86a1e5cea1ec07d18e2fd4dac1fd691 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 23 Dec 2005 05:00:55 +0000 Subject: [PATCH] * srv.c, Makefile.am: Only build srv.c if we need to. --- util/ChangeLog | 4 ++++ util/Makefile.am | 6 +++++- util/srv.c | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/util/ChangeLog b/util/ChangeLog index 0834f5b47..16c2338ce 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +2005-12-22 David Shaw + + * srv.c, Makefile.am: Only build srv.c if we need to. + 2005-12-10 Ryan Lortie (dshaw) * ttyio.c (tty_enable_completion, tty_disable_completion): Add diff --git a/util/Makefile.am b/util/Makefile.am index 8be94a90b..15b3617bc 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -24,7 +24,7 @@ noinst_LIBRARIES = libutil.a 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 @@ if USE_INTERNAL_REGEX 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 diff --git a/util/srv.c b/util/srv.c index e146237b7..21f1d9ade 100644 --- a/util/srv.c +++ b/util/srv.c @@ -20,7 +20,6 @@ */ #include -#ifdef USE_DNS_SRV #include #ifdef _WIN32 #include @@ -226,8 +225,6 @@ getsrv(const char *name,struct srventry **list) return -1; } -#endif /* USE_DNS_SRV */ - #ifdef TEST int main(int argc,char *argv[])