Build system: Break out SECNET_C_GETFUNC macro

No functional change.

Verified with `git diff -b' that there is no significant change to the
generated configure.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/aclocal.m4 b/aclocal.m4
index a963db9..13477df 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -26,3 +26,10 @@ define(ADNS_C_GETFUNC,[
   ])
  ])
 ])
+
+define(SECNET_C_GETFUNC,[
+ ADNS_C_GETFUNC($1,$2,[
+  LIBS="-l$2 $LIBS";
+  AC_MSG_WARN([$1 is in lib$2, urgh.  Must use -l$2.])
+ ])
+])

diff --git a/configure b/configure
index fdb6c4a..189666f 100755 (executable)
--- a/configure
+++ b/configure
@@ -4613,6 +4613,7 @@ _ACEOF
 fi
 
 
+
  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
 if test "x$ac_cv_func_inet_aton" = xyes; then :
 
@@ -4656,8 +4657,8 @@ fi
 $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
 if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
 
- LIBS="-lresolv $LIBS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: inet_aton is in libresolv, urgh.  Must use -lresolv." >&5
+  LIBS="-lresolv $LIBS";
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: inet_aton is in libresolv, urgh.  Must use -lresolv." >&5
 $as_echo "$as_me: WARNING: inet_aton is in libresolv, urgh.  Must use -lresolv." >&2;}
 
 else
@@ -4670,6 +4671,7 @@ fi
 fi
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for adns_init in -ladns" >&5
 $as_echo_n "checking for adns_init in -ladns... " >&6; }
 if ${ac_cv_lib_adns_adns_init+:} false; then :

diff --git a/configure.in b/configure.in
index 57c2076..68b8eb4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -83,10 +83,7 @@ if test "$ac_cv_lib_fl_yywrap" != yes; then
 fi
 AC_CHECK_LIB(nsl,inet_ntoa)
 AC_CHECK_LIB(socket,socket)
-ADNS_C_GETFUNC(inet_aton,resolv,[
- LIBS="-lresolv $LIBS";
- AC_MSG_WARN([inet_aton is in libresolv, urgh.  Must use -lresolv.])
-])
+SECNET_C_GETFUNC(inet_aton,resolv)
 AC_CHECK_LIB(adns,adns_init)
 REQUIRE_HEADER([adns.h])