Author: Steve Kemp Description: Compile under AMD64. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254002 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/configure +++ b/configure @@ -2667,15 +2667,62 @@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 +echo "configure:2672: checking for __dn_expand in -lresolv" >&5 +ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + for ac_func in dirname strlcpy strlcat strsep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2674: checking for $ac_func" >&5 +echo "configure:2721: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2728,12 +2775,12 @@ for ac_func in MD5Update do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2732: checking for $ac_func" >&5 +echo "configure:2779: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2788,12 +2835,12 @@ for ac_func in warnx do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2792: checking for $ac_func" >&5 +echo "configure:2839: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2848,12 +2895,12 @@ for ac_func in ether_ntoa do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2852: checking for $ac_func" >&5 +echo "configure:2899: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2912,7 +2959,7 @@ fi echo $ac_n "checking for Berkeley DB with 1.85 compatibility""... $ac_c" 1>&6 -echo "configure:2916: checking for Berkeley DB with 1.85 compatibility" >&5 +echo "configure:2963: checking for Berkeley DB with 1.85 compatibility" >&5 # Check whether --with-db or --without-db was given. if test "${with_db+set}" = set; then withval="$with_db" @@ -3015,7 +3062,7 @@ echo $ac_n "checking for libpcap""... $ac_c" 1>&6 -echo "configure:3019: checking for libpcap" >&5 +echo "configure:3066: checking for libpcap" >&5 # Check whether --with-libpcap or --without-libpcap was given. if test "${with_libpcap+set}" = set; then withval="$with_libpcap" @@ -3063,7 +3110,7 @@ echo $ac_n "checking for libnet""... $ac_c" 1>&6 -echo "configure:3067: checking for libnet" >&5 +echo "configure:3114: checking for libnet" >&5 # Check whether --with-libnet or --without-libnet was given. if test "${with_libnet+set}" = set; then withval="$with_libnet" @@ -3110,7 +3157,7 @@ echo $ac_n "checking for libnids""... $ac_c" 1>&6 -echo "configure:3114: checking for libnids" >&5 +echo "configure:3161: checking for libnids" >&5 # Check whether --with-libnids or --without-libnids was given. if test "${with_libnids+set}" = set; then withval="$with_libnids" @@ -3152,9 +3199,9 @@ save_cppflags="$CPPFLAGS" CPPFLAGS="$NIDSINC" echo $ac_n "checking whether libnids version is good""... $ac_c" 1>&6 -echo "configure:3156: checking whether libnids version is good" >&5 +echo "configure:3203: checking whether libnids version is good" >&5 cat > conftest.$ac_ext < EOF @@ -3173,7 +3220,7 @@ echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 -echo "configure:3177: checking for OpenSSL" >&5 +echo "configure:3224: checking for OpenSSL" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" --- a/configure.in +++ b/configure.in @@ -57,6 +57,7 @@ AC_CHECK_LIB(nsl, gethostbyname) dnl XXX - feh, everything except OpenBSD sux. AC_CHECK_LIB(resolv, dn_expand) +AC_CHECK_LIB(resolv, __dn_expand) AC_REPLACE_FUNCS(dirname strlcpy strlcat strsep) needmd5=no AC_CHECK_FUNCS(MD5Update, , [needmd5=yes])