Permalink
Browse files

Change use of AC_CHECK_LIB to AC_SEARCH_LIBS.

Patch from Zack Weinberg.  His message:

  This one eliminates all use of AC_CHECK_LIB in the configure script.
  AC_CHECK_LIB has a serious flaw: if the library you mention *exists*
  but is not *necessary* for the function you want, it adds it to
  $(LIBS) anyway.  This was fine in the days of static libraries,
  because the linker would ignore an .a library that didn't contain
  anything you needed. However, ELF shared libraries are different
  (let's not get into why): the linker will by default record a
  DT_NEEDED entry for every shared object mentioned on the link
  command line. Thus, every use of AC_CHECK_LIB is a potential
  unnecessary DT_NEEDED, making extra work for the dynamic loader. The
  cure is simply to use AC_SEARCH_LIBS instead; it first tries to find
  the function you ask for in libc, and only if that doesn't work does
  it try to use the extra library you mention.

  For the same reasons, pkg-config .pc files should distinguish
  between the libraries to use for shared linkage (Libs:) and the
  additional libraries needed for static linkage (Libs.private:). I
  have also made that correction in this patch. I also took the
  opportunity to clean up the substitution variables a little and make
  absolutely sure that the core library does not get linked against
  zlib.

svn:r1338
  • Loading branch information...
1 parent a501d68 commit d3a8ccb8073c3d76b8bfbb4205cfddfd5a351831 Nick Mathewson committed Jul 10, 2009
Showing with 16 additions and 12 deletions.
  1. +1 −0 ChangeLog
  2. +13 −11 configure.in
  3. +2 −1 libevent.pc.in
View
@@ -41,6 +41,7 @@ Changes in 2.0.2-alpha:
o Allow specifying the output filename for rpcgen; based on work by jmansion; patch from Zack Weinberg.
o Allow C identifiers as struct names; allow multiple comments in .rpc files; from Zack Weinberg
o Mitigate a race condition when using socket bufferevents in multiple threads.
+ o Use AC_SEARCH_LIBS, not AC_CHECK_LIB to avoid needless library use.
Changes in 2.0.1-alpha:
View
@@ -45,22 +45,24 @@ dnl AC_DISABLE_SHARED
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for libraries.
-AC_CHECK_LIB(socket, socket, [AC_SUBST( [LIBSOCKET], ["-lsocket"] )] )
-AC_CHECK_LIB(resolv, inet_aton, [AC_SUBST( [LIBRESOLV], ["-lresolv"] )] )
-AC_CHECK_LIB(rt, clock_gettime, [AC_SUBST( [LIBRT], ["-lrt"] )] )
-AC_CHECK_LIB(nsl, inet_ntoa, [AC_SUBST( [LIBNSL], ["-lnsl"] )] )
+AC_SEARCH_LIBS([inet_ntoa], [nsl])
+AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([inet_aton], [resolv])
+AC_SEARCH_LIBS([clock_gettime], [rt])
dnl Determine if we have zlib for regression tests
+dnl Don't put this one in LIBS
+save_LIBS="$LIBS"
+LIBS=""
ZLIB_LIBS=""
-ZLIB_CFLAGS=""
-AC_CHECK_LIB(z, inflateEnd,
+have_zlib=no
+AC_SEARCH_LIBS([inflateEnd], [z],
[have_zlib=yes
- ZLIB_LIBS="-lz"
- AC_DEFINE(HAVE_LIBZ, 1, [Define if the system has zlib])],
- [have_zlib=no])
+ ZLIB_LIBS="$LIBS"
+ AC_DEFINE(HAVE_LIBZ, 1, [Define if the system has zlib])])
+LIBS="$save_LIBS"
AC_SUBST(ZLIB_LIBS)
-AC_SUBST(ZLIB_CFLAGS)
-AM_CONDITIONAL(ZLIB_REGRESS, [test "$have_zlib" != "no"])
+AM_CONDITIONAL(ZLIB_REGRESS, [test "$have_zlib" = "yes"])
dnl Checks for header files.
AC_HEADER_STDC
View
@@ -10,6 +10,7 @@ Description: libevent is an asynchronous notification event loop library
Version: @VERSION@
Requires:
Conflicts:
-Libs: -L${libdir} -levent @LIBSOCKET@ @LIBRESOLV@ @LIBRT@ @LIBNSL@ @ZLIB_LIBS@
+Libs: -L${libdir} -levent
+Libs.private: @LIBS@
Cflags: -I${includedir}

0 comments on commit d3a8ccb

Please sign in to comment.