travis compatible libresolv check

5 files changed, 38 insertions, 47 deletions

diff --git a/configure b/configure
index c27bef7..bfe648e 100755
--- a/configure
+++ b/configure
@@ -6450,12 +6450,13 @@ if test "x$ac_cv_header_resolv_h" = xyes; then :
 #define HAVE_RESOLV_H 1
 _ACEOF
 
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_init" >&5
-$as_echo_n "checking for library containing __res_init... " >&6; }
-if ${ac_cv_search___res_init+:} false; then :
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_init in -lresolv" >&5
+$as_echo_n "checking for __res_init in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___res_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6474,35 +6475,27 @@ return __res_init ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search___res_init=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_resolv___res_init=yes
+else
+  ac_cv_lib_resolv___res_init=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search___res_init+:} false; then :
-  break
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-done
-if ${ac_cv_search___res_init+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_init" >&5
+$as_echo "$ac_cv_lib_resolv___res_init" >&6; }
+if test "x$ac_cv_lib_resolv___res_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRESOLV 1
+_ACEOF
+
+  LIBS="-lresolv $LIBS"
 
 else
-  ac_cv_search___res_init=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+  as_fn_error $? "__res_init not found int resolv" "$LINENO" 5
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_init" >&5
-$as_echo "$ac_cv_search___res_init" >&6; }
-ac_res=$ac_cv_search___res_init
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working resolve" >&5
 $as_echo_n "checking for working resolve... " >&6; }
@@ -6522,14 +6515,14 @@ res_init();
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+                                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_RESOLVE 1
 _ACEOF
 
-                          if true; then
+                                             if true; then
   RESOLVE_TRUE=
   RESOLVE_FALSE='#'
 else
@@ -6540,12 +6533,9 @@ fi
 
 else
 
-                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-
-fi
-
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
diff --git a/configure.ac b/configure.ac
index 8d35d4a..63c6ac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,23 +34,23 @@ AC_HEADER_STAT
 AC_HEADER_DIRENT
 AC_HEADER_ASSERT
 AC_CHECK_HEADERS([glob.h stdio.h stdlib.h stdbool.h string.h unistd.h errno.h sys/stat.h sys/types.h sys/wait.h fcntl.h semaphore.h time.h mqueue.h syslog.h],[],[AC_MSG_ERROR([*** missing essential header files])])
-AC_CHECK_HEADERS([resolv.h],[
-                   AC_SEARCH_LIBS([__res_init], [resolv],[
+AC_CHECK_HEADERS([resolv.h],
+                 [
+                     AC_CHECK_LIB([resolv], [__res_init], [], [AC_MSG_ERROR([__res_init not found int resolv])])
                      AC_MSG_CHECKING([for working resolve])
                      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]],
                                                         [[res_init();]]
                                                         [[printf("%s\n", _res.defdname);]]
                                                         [[res_close();]]
                                                        )],
-                       [
-                         AC_MSG_RESULT([yes])
-                         AC_DEFINE_UNQUOTED([HAVE_RESOLVE], 1, [Define to 1 if you have libc resolv.])
-                         AM_CONDITIONAL(RESOLVE, true)
-                       ],
-                       [
-                         AC_MSG_RESULT([no])
-                       ]
-                     ]),[AC_MSG_ERROR([*** Missing resolv library. -lresolv])])
+                                       [
+                                            AC_MSG_RESULT([yes])
+                                            AC_DEFINE_UNQUOTED([HAVE_RESOLVE], 1, [Define to 1 if you have libc resolv.])
+                                            AM_CONDITIONAL(RESOLVE, true)
+                                       ],
+                                       [
+                                            AC_MSG_RESULT([no])
+                                       ])
                  ],[AC_MSG_WARN([*** DNS information disabled])])
 
 # Checks for typedefs, structures, and compiler characteristics.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9fa6b3e..8ad31f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,5 +10,4 @@ naskpass_CFLAGS=-fPIC -fomit-frame-pointer -fexpensive-optimizations -Os
 endif
 if RESOLVE
 naskpass_CFLAGS+=-DHAVE_RESOLVE
-naskpass_LDFLAGS+=-lresolv
 endif
diff --git a/src/Makefile.in b/src/Makefile.in
index 718ab6d..66bd91f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -81,7 +81,6 @@ host_triplet = @host@
 bin_PROGRAMS = naskpass$(EXEEXT) naskshell$(EXEEXT) \
 	naskpass_check$(EXEEXT)
 @RESOLVE_TRUE@am__append_1 = -DHAVE_RESOLVE
-@RESOLVE_TRUE@am__append_2 = -lresolv
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/aconfig.h.in $(top_srcdir)/build/depcomp
@@ -276,7 +275,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 naskpass_SOURCES = main.c log.c opt.c utils.c status.c ui_ani.c ui.c ui_input.c ui_ipc.c ui_txtwindow.c ui_statusbar.c ui_nask.c
-naskpass_LDFLAGS = $(am__append_2)
+naskpass_LDFLAGS = 
 naskpass_check_SOURCES = check/check.c
 naskshell_SOURCES = shell/shell.c
 @DEBUG_FALSE@naskpass_CFLAGS = -fPIC -fomit-frame-pointer \
diff --git a/src/aconfig.h.in b/src/aconfig.h.in
index cbae5a0..f9c5598 100644
--- a/src/aconfig.h.in
+++ b/src/aconfig.h.in
@@ -43,6 +43,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC