Use autoconf to find -linnstorage etc., and link statically

diff --git a/Makefile.am b/Makefile.am
index a120988f78c79df9579381d7dabec663b73dd9e2..7850d48f11fdabb0c96c8b4828c0f498529b832b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ innduct_SOURCES = duct.c conn.c filemon.c infile.c recv.c xmit.c \
 
 dist_doc_DATA = README.states README.statistics
 
-innduct_LDADD = -L/usr/lib/news -lstorage -linn -lm -loop
+innduct_LDADD = -lm -loop
 
 autogen autoconf:
        ./autogen.sh

diff --git a/Makefile.in b/Makefile.in
index e49548ecc004e816aa4e0b8c504ccda0fdf1f195..6b06eaaa9a1ec2bbda77600e11d723c475554426 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,10 +234,11 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
        $(top_srcdir)/autoconf-aux/depcomp \
        $(top_srcdir)/autoconf-aux/install-sh \
        $(top_srcdir)/autoconf-aux/missing \
-       $(top_srcdir)/autoconf-aux/mkinstalldirs autoconf-aux/compile \
-       autoconf-aux/config.guess autoconf-aux/config.sub \
-       autoconf-aux/depcomp autoconf-aux/install-sh \
-       autoconf-aux/missing autoconf-aux/mkinstalldirs
+       $(top_srcdir)/autoconf-aux/mkinstalldirs autoconf-aux/COPYING \
+       autoconf-aux/compile autoconf-aux/config.guess \
+       autoconf-aux/config.sub autoconf-aux/depcomp \
+       autoconf-aux/install-sh autoconf-aux/missing \
+       autoconf-aux/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -362,7 +363,7 @@ innduct_SOURCES = duct.c conn.c filemon.c infile.c recv.c xmit.c \
                cli.c defer.c help.c statemc.c __oop-read-copy.c
 
 dist_doc_DATA = README.states README.statistics
-innduct_LDADD = -L/usr/lib/news -lstorage -linn -lm -loop
+innduct_LDADD = -lm -loop
 MAINTAINERCLEANFILES = configure config.h.in Makefile.in
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am

diff --git a/configure b/configure
index d3d54deb7b13d1bc66a0de904cd47f623502fd68..320d6a1cdfe6eb0cbb8721371469e9153ea9e981 100755 (executable)
--- a/configure
+++ b/configure
@@ -1685,6 +1685,52 @@ $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -3686,6 +3732,7 @@ fi
 
 
 
+LDFLAGS="$LDFLAGS -L/usr/lib/news"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4097,6 +4144,140 @@ fi
 done
 
 
+LIBS="-Wl,-Bdynamic $LIBS"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing NNTPconnect" >&5
+$as_echo_n "checking for library containing NNTPconnect... " >&6; }
+if ${ac_cv_search_NNTPconnect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char NNTPconnect ();
+int
+main ()
+{
+return NNTPconnect ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' inn; 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_NNTPconnect=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_NNTPconnect+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_NNTPconnect+:} false; then :
+
+else
+  ac_cv_search_NNTPconnect=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_NNTPconnect" >&5
+$as_echo "$ac_cv_search_NNTPconnect" >&6; }
+ac_res=$ac_cv_search_NNTPconnect
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+
+  as_fn_error $? "failed to find libinn" "$LINENO" 5
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SMinit" >&5
+$as_echo_n "checking for library containing SMinit... " >&6; }
+if ${ac_cv_search_SMinit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SMinit ();
+int
+main ()
+{
+return SMinit ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' innstorage storage; 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_SMinit=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_SMinit+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_SMinit+:} false; then :
+
+else
+  ac_cv_search_SMinit=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SMinit" >&5
+$as_echo "$ac_cv_search_SMinit" >&6; }
+ac_res=$ac_cv_search_SMinit
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+
+  as_fn_error $? "Failed to find INN storage library (-linnstorage, -lstorage)" "$LINENO" 5
+
+fi
+
+
+# Possibly, we could link dynamically.  But the ABI stability of
+# the inn libraries is questionable.  On Debian only the .a files
+# are in inn2-dev.  The .so's are in inn2.deb, which isn't depended on
+# by inn2-dev, and which doesn't have a # shlibs file for them.
+# So right now we can't sensibly link dynamically.
+#
+# So we pass -Bstatic.  (Recall that LIBS is generally *prepended* to,
+# and that it is automatically included in link lines by automake
+# so nothing is needed in Makefile.am.)
+LIBS="-Wl,-Bstatic $LIBS"
+
 ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files Makefile"

diff --git a/configure.ac b/configure.ac
index 4c9a08f97c6e697a9400c85303b893b18a793b2b..4f7c559c10bcee6f4bcd653450b28aa1302ffb8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,29 @@ AM_INIT_AUTOMAKE([])
 
 AC_PROG_CC
 
+LDFLAGS="$LDFLAGS -L/usr/lib/news"
 AC_CHECK_HEADERS(sys/inotify.h)
 
+LIBS="-Wl,-Bdynamic $LIBS"
+
+AC_SEARCH_LIBS(NNTPconnect, [inn], [],[
+  AC_MSG_ERROR([failed to find libinn])
+])
+AC_SEARCH_LIBS(SMinit, [innstorage storage], [],[
+  AC_MSG_ERROR([Failed to find INN storage library (-linnstorage, -lstorage)])
+])
+
+# Possibly, we could link dynamically.  But the ABI stability of
+# the inn libraries is questionable.  On Debian only the .a files
+# are in inn2-dev.  The .so's are in inn2.deb, which isn't depended on
+# by inn2-dev, and which doesn't have a # shlibs file for them.
+# So right now we can't sensibly link dynamically.
+#
+# So we pass -Bstatic.  (Recall that LIBS is generally *prepended* to,
+# and that it is automatically included in link lines by automake
+# so nothing is needed in Makefile.am.)
+LIBS="-Wl,-Bstatic $LIBS"
+
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT