[svn] GnuPG - r4189 - in trunk: . g10 keyserver util
svn author dshaw
cvs at cvs.gnupg.org
Sun Jul 9 01:29:26 CEST 2006
Author: dshaw
Date: 2006-07-09 01:29:25 +0200 (Sun, 09 Jul 2006)
New Revision: 4189
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/g10/Makefile.am
trunk/keyserver/Makefile.am
trunk/util/Makefile.am
Log:
* configure.ac: Fix resolver autoconf code so it works (fails)
properly with uClibc.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-07-03 13:26:19 UTC (rev 4188)
+++ trunk/ChangeLog 2006-07-08 23:29:25 UTC (rev 4189)
@@ -1,3 +1,8 @@
+2006-07-08 David Shaw <dshaw at jabberwocky.com>
+
+ * configure.ac: Fix resolver autoconf code so it works (fails)
+ properly with uClibc.
+
2006-06-25 Werner Koch <wk at g10code.com>
Released 1.4.4.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-07-03 13:26:19 UTC (rev 4188)
+++ trunk/configure.ac 2006-07-08 23:29:25 UTC (rev 4189)
@@ -595,44 +595,47 @@
use_dns_cert=$enableval,use_dns_cert=yes)
if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
- _srv_save_libs=$LIBS
+ _dns_save_libs=$LIBS
LIBS=""
# the double underscore thing is a glibc-ism?
AC_SEARCH_LIBS(res_query,resolv bind,,
- AC_SEARCH_LIBS(__res_query,resolv bind,,use_dns_srv=no))
+ AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no))
AC_SEARCH_LIBS(dn_expand,resolv bind,,
- AC_SEARCH_LIBS(__dn_expand,resolv bind,,use_dns_srv=no))
+ AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
AC_SEARCH_LIBS(dn_skipname,resolv bind,,
- AC_SEARCH_LIBS(__dn_skipname,resolv bind,,use_dns_srv=no))
+ AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no))
- # Make sure that the BIND 4 resolver interface is workable before
- # enabling any code that calls it. At some point I'll rewrite the
- # code to use the BIND 8 resolver API.
+ if test x"$have_resolver" != xno ; then
- AC_MSG_CHECKING([whether the resolver is usable])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
+ # Make sure that the BIND 4 resolver interface is workable before
+ # enabling any code that calls it. At some point I'll rewrite the
+ # code to use the BIND 8 resolver API.
+
+ AC_MSG_CHECKING([whether the resolver is usable])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>],
-[[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);]])],have_resolver=yes,have_resolver=no)
- AC_MSG_RESULT($have_resolver)
+[[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],have_resolver=yes,have_resolver=no)
+ AC_MSG_RESULT($have_resolver)
-# This is Apple-specific and somewhat bizarre as they changed the
-# define in bind 8 for some reason.
+ # This is Apple-specific and somewhat bizarre as they changed the
+ # define in bind 8 for some reason.
- if test x"$have_resolver" != xyes ; then
- AC_MSG_CHECKING([whether I can make the resolver usable with BIND_8_COMPAT])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT
+ if test x"$have_resolver" != xyes ; then
+ AC_MSG_CHECKING([whether I can make the resolver usable with BIND_8_COMPAT])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>],
-[[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);]])],[have_resolver=yes ; need_compat=yes])
- AC_MSG_RESULT($have_resolver)
+[[unsigned char answer[PACKETSZ]; res_query("foo.bar",C_IN,T_A,answer,PACKETSZ); dn_skipname(0,0); dn_expand(0,0,0,0,0);]])],[have_resolver=yes ; need_compat=yes])
+ AC_MSG_RESULT($have_resolver)
+ fi
fi
if test x"$have_resolver" = xyes ; then
- SRVLIBS=$LIBS
+ DNSLIBS=$LIBS
if test x"$use_dns_srv" = xyes ; then
AC_DEFINE(USE_DNS_SRV,1,[define to use DNS SRV])
@@ -647,7 +650,7 @@
fi
if test x"$need_compat" = xyes ; then
- AC_DEFINE(BIND_8_COMPAT,1,[an Appleism])
+ AC_DEFINE(BIND_8_COMPAT,1,[an Apple OSXism])
fi
else
use_dns_srv=no
@@ -655,10 +658,10 @@
use_dns_cert=no
fi
- LIBS=$_srv_save_libs
+ LIBS=$_dns_save_libs
fi
-AC_SUBST(SRVLIBS)
+AC_SUBST(DNSLIBS)
AM_CONDITIONAL(USE_DNS_SRV, test x"$use_dns_srv" = xyes)
Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am 2006-07-03 13:26:19 UTC (rev 4188)
+++ trunk/g10/Makefile.am 2006-07-08 23:29:25 UTC (rev 4189)
@@ -30,7 +30,7 @@
endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
-other_libs = $(LIBICONV) $(SRVLIBS) $(LIBINTL) $(CAPLIBS)
+other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
bin_PROGRAMS = gpg gpgv
Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am 2006-07-03 13:26:19 UTC (rev 4188)
+++ trunk/keyserver/Makefile.am 2006-07-08 23:29:25 UTC (rev 4189)
@@ -42,9 +42,9 @@
if FAKE_CURL
gpgkeys_curl_SOURCES += curl-shim.c curl-shim.h
-gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
+gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
+gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
else
gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@
Modified: trunk/util/Makefile.am
===================================================================
--- trunk/util/Makefile.am 2006-07-03 13:26:19 UTC (rev 4188)
+++ trunk/util/Makefile.am 2006-07-08 23:29:25 UTC (rev 4189)
@@ -58,16 +58,16 @@
http-test: http.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
- -DTEST -o http-test http.c libutil.a @LIBINTL@ @SRVLIBS@ @CAPLIBS@
+ -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
srv-test: srv.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
- -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @SRVLIBS@ @CAPLIBS@
+ -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
pka-test: pka.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
- -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @SRVLIBS@ @CAPLIBS@
+ -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
cert-test: cert.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
- -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @SRVLIBS@ @CAPLIBS@
+ -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
More information about the Gnupg-commits
mailing list