Justin Erenkrantz <jerenkrantz@ebuilt.com> writes:
> Hopefully, this is in the "right" format. Changelog tells
> all. -- justin
Thanks, Justin.
Could you clarify the motivation for this? (The log message is
already a fine description of the change itself.)
If I tried a wider variety of configuration options personally, I
probably wouldn't have to ask. But since at present I'm not sure what
bug or misfeature you ran into to prompt this change, I'm not sure how
to prioritize it, test it, etc.
-Karl
> (SVN_LIB_NEON): Actually grab the correct compiling and linking flags
> from neon-config when --with-neon is specified. Factor out the
> /usr/include removal of SVN_NEON_INCLUDES to always happen, not
> just in the non --with-neon case.
>
> Index: ac-helpers/neon.m4
> ===================================================================
> --- ac-helpers/.svn/text-base/neon.m4.svn-base Mon Dec 10 01:49:38 2001
> +++ ac-helpers/neon.m4 Wed Dec 12 22:26:16 2001
> @@ -35,6 +35,28 @@
> else
> neon_config="$withval/bin/neon-config"
> fi
> +
> + if test -x "$neon_config"; then
> + AC_MSG_CHECKING([neon version])
> + NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
> + AC_MSG_RESULT([$NEON_VERSION])
> +
> + if test "$NEON_WANTED" != "$NEON_VERSION"; then
> + echo "You have neon version $NEON_VERSION,"
> + echo "but Subversion needs neon $NEON_WANTED."
> + SVN_DOWNLOAD_NEON()
> + else
> + changequote(<<, >>)dnl
> + SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
> + NEON_LIBS=`$neon_config --libs | sed -e 's/-lneon//g'`
> + CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
> + changequote([, ])dnl
> + NEON_LIBS="$NEON_LIBS "`$neon_config --prefix `"/lib/libneon.la"
> + fi
> + else
> + echo "You do not have neon-config."
> + SVN_DOWNLOAD_NEON()
> + fi
> fi
> ],
> [
> @@ -108,13 +130,13 @@
> fi
> fi
>
> - # neon should not add -I/usr/include to --cflags; remove this when it doesn't.
> - # Leaving it in means a system DB3 etc could be picked up.
> - SVN_NEON_INCLUDES=`echo $SVN_NEON_INCLUDES | sed -e "s|-I/usr/include ||g" \
> - -e "s|-I/usr/include$||g"`
> -
> ])
>
> + # neon should not add -I/usr/include to --cflags; remove this when it doesn't.
> + # Leaving it in means a system DB3 etc could be picked up.
> + SVN_NEON_INCLUDES=`echo $SVN_NEON_INCLUDES | sed -e "s|-I/usr/include ||g" \
> + -e "s|-I/usr/include$||g"`
> +
> AC_SUBST(SVN_NEON_INCLUDES)
> AC_SUBST(NEON_LIBS)
> ])
>
>
> ---------------------------------------------------------------------
> 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
Received on Sat Oct 21 14:36:53 2006