diff options
| author | David Shaw <[email protected]> | 2005-12-23 05:00:55 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-12-23 05:00:55 +0000 |
| commit | 5e08b08da86a1e5cea1ec07d18e2fd4dac1fd691 (patch) | |
| tree | c0bc0292719dc2ebe198f1a955308570c69ce973 | |
| parent | * configure.ac: Split PKA checking off from DNS SRV checking. (diff) | |
| download | gnupg-5e08b08da86a1e5cea1ec07d18e2fd4dac1fd691.tar.gz gnupg-5e08b08da86a1e5cea1ec07d18e2fd4dac1fd691.zip | |
* srv.c, Makefile.am: Only build srv.c if we need to.
Diffstat (limited to '')
| -rw-r--r-- | util/ChangeLog | 4 | ||||
| -rw-r--r-- | util/Makefile.am | 6 | ||||
| -rw-r--r-- | 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 <[email protected]> + + * srv.c, Makefile.am: Only build srv.c if we need to. + 2005-12-10 Ryan Lortie <[email protected]> (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 <config.h> -#ifdef USE_DNS_SRV #include <sys/types.h> #ifdef _WIN32 #include <windows.h> @@ -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[]) |