Author: jpeach Date: 2005-08-13 09:43:12 +0000 (Sat, 13 Aug 2005) New Revision: 9302
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9302 Log: Change AC_LIBTESTFUNC to check in the current $LIBS before adding the new library. This stop us adding spurious libraries when the symbol we are looking for is in libc. Bugzilla bug #2471. Modified: branches/SAMBA_3_0/source/aclocal.m4 trunk/source/aclocal.m4 Changeset: Modified: branches/SAMBA_3_0/source/aclocal.m4 =================================================================== --- branches/SAMBA_3_0/source/aclocal.m4 2005-08-13 08:49:50 UTC (rev 9301) +++ branches/SAMBA_3_0/source/aclocal.m4 2005-08-13 09:43:12 UTC (rev 9302) @@ -102,16 +102,22 @@ ]) -dnl check for a function in a library, but don't +dnl Check for a function in a library, but don't dnl keep adding the same library to the LIBS variable. +dnl Check whether the function is available in the current +dnl LIBS before adding the library. This prevents us spuriously +dnl finding symbols that are in libc. dnl AC_LIBTESTFUNC(lib,func) AC_DEFUN(AC_LIBTESTFUNC, -[case "$LIBS" in - *-l$1*) AC_CHECK_FUNCS($2) ;; - *) AC_CHECK_LIB($1, $2) - AC_CHECK_FUNCS($2) - ;; - esac +[ + AC_CHECK_FUNCS($2, [], + [ case "$LIBS" in + *-l$1*) AC_CHECK_FUNCS($2) ;; + *) AC_CHECK_LIB($1, $2) + AC_CHECK_FUNCS($2) + ;; + esac + ]) ]) # AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION], Modified: trunk/source/aclocal.m4 =================================================================== --- trunk/source/aclocal.m4 2005-08-13 08:49:50 UTC (rev 9301) +++ trunk/source/aclocal.m4 2005-08-13 09:43:12 UTC (rev 9302) @@ -102,16 +102,22 @@ ]) -dnl check for a function in a library, but don't +dnl Check for a function in a library, but don't dnl keep adding the same library to the LIBS variable. +dnl Check whether the function is available in the current +dnl LIBS before adding the library. This prevents us spuriously +dnl finding symbols that are in libc. dnl AC_LIBTESTFUNC(lib,func) AC_DEFUN(AC_LIBTESTFUNC, -[case "$LIBS" in - *-l$1*) AC_CHECK_FUNCS($2) ;; - *) AC_CHECK_LIB($1, $2) - AC_CHECK_FUNCS($2) - ;; - esac +[ + AC_CHECK_FUNCS($2, [], + [ case "$LIBS" in + *-l$1*) AC_CHECK_FUNCS($2) ;; + *) AC_CHECK_LIB($1, $2) + AC_CHECK_FUNCS($2) + ;; + esac + ]) ]) # AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
