You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joe Orton <jo...@redhat.com> on 2005/06/15 07:37:17 UTC

[PATCH] just link against libneon.la

* build/ac-macros/neon.m4 (SVN_LIB_NEON): If using the bundled neon,
don't add the output of `neon-config --libs` to NEON_LIBS as well as
libneon.la, since libneon.la file already records the library
dependencies.  (as already done if an external neon library is used)

Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4	(revision 15058)
+++ build/ac-macros/neon.m4	(working copy)
@@ -83,12 +83,6 @@
           SVN_SUBDIR_CONFIG(neon, $args)
 
           if test -f "$abs_builddir/neon/neon-config" ; then
-            AC_MSG_CHECKING([for any extra libraries neon needs])
-            # this is not perfect since it will pick up extra -L flags too,
-            # but that shouldn't do any real damage.
-            NEON_LIBS_NEW=`$SHELL $abs_builddir/neon/neon-config --libs | sed -e"s/-lneon//g"`
-            AC_MSG_RESULT([$NEON_LIBS_NEW])
-            NEON_LIBS="$NEON_LIBS $NEON_LIBS_NEW"
             # Also find out which macros neon defines (but ignore extra include paths):
             # this will include -DNEON_SSL if neon was built with SSL support
             CFLAGS=["$CFLAGS `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-I[^ ]*//g'`"]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] just link against libneon.la

Posted by kf...@collab.net.
Joe Orton <jo...@redhat.com> writes:
> * build/ac-macros/neon.m4 (SVN_LIB_NEON): If using the bundled neon,
> don't add the output of `neon-config --libs` to NEON_LIBS as well as
> libneon.la, since libneon.la file already records the library
> dependencies.  (as already done if an external neon library is used)

Applied in r15083, thanks!

-Karl

> Index: build/ac-macros/neon.m4
> ===================================================================
> --- build/ac-macros/neon.m4	(revision 15058)
> +++ build/ac-macros/neon.m4	(working copy)
> @@ -83,12 +83,6 @@
>            SVN_SUBDIR_CONFIG(neon, $args)
>  
>            if test -f "$abs_builddir/neon/neon-config" ; then
> -            AC_MSG_CHECKING([for any extra libraries neon needs])
> -            # this is not perfect since it will pick up extra -L flags too,
> -            # but that shouldn't do any real damage.
> -            NEON_LIBS_NEW=`$SHELL $abs_builddir/neon/neon-config --libs | sed -e"s/-lneon//g"`
> -            AC_MSG_RESULT([$NEON_LIBS_NEW])
> -            NEON_LIBS="$NEON_LIBS $NEON_LIBS_NEW"
>              # Also find out which macros neon defines (but ignore extra include paths):
>              # this will include -DNEON_SSL if neon was built with SSL support
>              CFLAGS=["$CFLAGS `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-I[^ ]*//g'`"]
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org