Arfrever Frehtes Taifersar Arahesis wrote:
> Author: arfrever
> Date: Thu Jul 9 09:59:57 2009
> New Revision: 38386
>
> Log:
> Follow-up to r38377:
> Rename SVN_REMOVE_REDUNDANT_LIB_DIRS to SVN_REMOVE_STANDARD_LIB_DIRS.
>
> * build/ac-macros/svn-macros.m4
> (SVN_REMOVE_REDUNDANT_LIB_DIRS): Rename to ...
> (SVN_REMOVE_STANDARD_LIB_DIRS): ... this. Improve doc string.
Thanks. That is much better.
Please also mention the functional change here.
- Julian
> * build/ac-macros/apr.m4
> (SVN_LIB_APR):
> * build/ac-macros/aprutil.m4
> (SVN_LIB_APRUTIL):
> * build/ac-macros/gssapi.m4
> (SVN_LIB_RA_SERF_GSSAPI):
> * build/ac-macros/kwallet.m4
> (SVN_LIB_KWALLET):
> * build/ac-macros/sasl.m4
> (SVN_LIB_SASL):
> * build/ac-macros/sqlite.m4
> (SVN_SQLITE_DIR_CONFIG):
> * build/ac-macros/zlib.m4
> (SVN_LIB_Z): Update.
>
> Suggested by: julianfoad
> stsp
>
> Modified:
> trunk/build/ac-macros/apr.m4
> trunk/build/ac-macros/aprutil.m4
> trunk/build/ac-macros/gssapi.m4
> trunk/build/ac-macros/kwallet.m4
> trunk/build/ac-macros/sasl.m4
> trunk/build/ac-macros/sqlite.m4
> trunk/build/ac-macros/svn-macros.m4
> trunk/build/ac-macros/zlib.m4
>
> Modified: trunk/build/ac-macros/apr.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/apr.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/apr.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/apr.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -63,7 +63,7 @@ AC_DEFUN(SVN_LIB_APR,
> if test $? -ne 0; then
> AC_MSG_ERROR([apr-config --ldflags failed])
> fi
> - LDFLAGS="$LDFLAGS `SVN_REMOVE_REDUNDANT_LIB_DIRS($apr_ldflags)`"
> + LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($apr_ldflags)`"
>
> SVN_APR_INCLUDES="`$apr_config --includes`"
> if test $? -ne 0; then
> @@ -86,7 +86,7 @@ AC_DEFUN(SVN_LIB_APR,
> AC_MSG_ERROR([apr-config --link-ld failed])
> fi
> fi
> - SVN_APR_LIBS="`SVN_REMOVE_REDUNDANT_LIB_DIRS($SVN_APR_LIBS)`"
> + SVN_APR_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APR_LIBS)`"
>
> SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
> if test $? -ne 0; then
>
> Modified: trunk/build/ac-macros/aprutil.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/aprutil.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/aprutil.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/aprutil.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -66,7 +66,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
> if test $? -ne 0; then
> AC_MSG_ERROR([apu-config --ldflags failed])
> fi
> - LDFLAGS="$LDFLAGS `SVN_REMOVE_REDUNDANT_LIB_DIRS($apu_ldflags)`"
> + LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($apu_ldflags)`"
>
> SVN_APRUTIL_INCLUDES="`$apu_config --includes`"
> if test $? -ne 0; then
> @@ -89,7 +89,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
> AC_MSG_ERROR([apu-config --link-ld failed])
> fi
> fi
> - SVN_APRUTIL_LIBS="`SVN_REMOVE_REDUNDANT_LIB_DIRS($SVN_APRUTIL_LIBS)`"
> + SVN_APRUTIL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APRUTIL_LIBS)`"
>
> AC_SUBST(SVN_APRUTIL_INCLUDES)
> AC_SUBST(SVN_APRUTIL_LIBS)
>
> Modified: trunk/build/ac-macros/gssapi.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/gssapi.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/gssapi.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/gssapi.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -36,7 +36,7 @@ AC_DEFUN(SVN_LIB_RA_SERF_GSSAPI,
> CFLAGS=""
> SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
> SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
> - SVN_GSSAPI_LIBS="`SVN_REMOVE_REDUNDANT_LIB_DIRS($SVN_GSSAPI_LIBS)`"
> + SVN_GSSAPI_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_GSSAPI_LIBS)`"
> CPPFLAGS="$CPPFLAGS $SVN_GSSAPI_INCLUDES"
> CFLAGS="$old_CFLAGS"
> LIBS="$LIBS $SVN_GSSAPI_LIBS"
>
> Modified: trunk/build/ac-macros/kwallet.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/kwallet.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/kwallet.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/kwallet.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -52,7 +52,7 @@ AC_DEFUN(SVN_LIB_KWALLET,
> LIBS="$LIBS $SVN_KWALLET_LIBS"
> qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
> kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
> - LDFLAGS="$old_LDFLAGS `SVN_REMOVE_REDUNDANT_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
> + LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
> AC_LANG(C++)
> AC_LINK_IFELSE([
> #include <kwallet.h>
>
> Modified: trunk/build/ac-macros/sasl.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/sasl.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/sasl.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/sasl.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -49,7 +49,7 @@ AC_DEFUN(SVN_LIB_SASL,
> if test "$svn_lib_sasl" = "no"; then
> SVN_SASL_INCLUDES="-I${with_sasl}/include"
> CPPFLAGS="$CPPFLAGS $SVN_SASL_INCLUDES"
> - LDFLAGS="$LDFLAGS `SVN_REMOVE_REDUNDANT_LIB_DIRS(-L${with_sasl}/lib)`"
> + LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L${with_sasl}/lib)`"
>
> AC_CHECK_HEADER(sasl/sasl.h,
> [AC_CHECK_HEADER(sasl/saslutil.h,
>
> Modified: trunk/build/ac-macros/sqlite.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/sqlite.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/sqlite.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/sqlite.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -142,7 +142,7 @@ SQLITE_VERSION_OKAY
> SVN_SQLITE_LIBS="-lsqlite3"
> else
> SVN_SQLITE_INCLUDES="-I$sqlite_dir/include"
> - SVN_SQLITE_LIBS="`SVN_REMOVE_REDUNDANT_LIB_DIRS(-L$sqlite_dir/lib -lsqlite3)`"
> + SVN_SQLITE_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS(-L$sqlite_dir/lib -lsqlite3)`"
> fi
> ])], [AC_MSG_RESULT([unsupported SQLite version])])
> ])
>
> Modified: trunk/build/ac-macros/svn-macros.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/svn-macros.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/svn-macros.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/svn-macros.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -153,10 +153,16 @@ AC_DEFUN(SVN_MAYBE_ADD_TO_CFLAGS,
> fi
> ])
>
> -dnl SVN_REMOVE_REDUNDANT_LIB_DIRS
> +dnl SVN_REMOVE_STANDARD_LIB_DIRS(OPTIONS)
> dnl
> -dnl Remove redundant library directories (e.g. /usr/lib).
> -AC_DEFUN([SVN_REMOVE_REDUNDANT_LIB_DIRS],
> +dnl Remove standard library search directories.
> +dnl OPTIONS is a list of compiler/linker options.
> +dnl This macro prints input options except -L options whose arguments are
> +dnl standard library search directories (e.g. /usr/lib).
> +dnl
> +dnl This macro is used to avoid linking against Subversion libraries
> +dnl potentially placed in standard library search directories.
> +AC_DEFUN([SVN_REMOVE_STANDARD_LIB_DIRS],
> [
> input_flags="$1"
> output_flags=""
> @@ -164,7 +170,7 @@ AC_DEFUN([SVN_REMOVE_REDUNDANT_LIB_DIRS]
> for flag in $input_flags; do
> filter="no"
> for dir in $filtered_dirs; do
> - if test "$flag" = "-L$dir"; then
> + if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
> filter="yes"
> break
> fi
>
> Modified: trunk/build/ac-macros/zlib.m4
> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/zlib.m4?pathrev=38386&r1=38385&r2=38386
> ==============================================================================
> --- trunk/build/ac-macros/zlib.m4 Thu Jul 9 08:38:08 2009 (r38385)
> +++ trunk/build/ac-macros/zlib.m4 Thu Jul 9 09:59:57 2009 (r38386)
> @@ -41,7 +41,7 @@ AC_DEFUN(SVN_LIB_Z,
> if test "$zlib_found" = "yes"; then
> SVN_ZLIB_PREFIX="$zlib_prefix"
> SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
> - LDFLAGS="$LDFLAGS `SVN_REMOVE_REDUNDANT_LIB_DIRS(-L$zlib_prefix/lib)`"
> + LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
> fi
>
> SVN_ZLIB_LIBS="-lz"
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2369450
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2369636
Received on 2009-07-10 12:38:11 CEST