[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r34994 - in trunk: . build/ac-macros

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 31 Dec 2008 11:06:35 -0800

Oops. On IRC, Arfrever pointed out that --with-neon (no argument
value) bailed before. So this *adds* functionality.

All good. Never mind.

Thanks, A.,
-g

On Wed, Dec 31, 2008 at 10:54, Greg Stein <gstein_at_gmail.com> wrote:
> Hmm. It looks like if I say --with-neon, then it won't find
> neon-config any more. That doesn't seem right. I might not be using
> pkg-config.
>
> Seems that you could look for pkg-config first, fail that, then look
> for neon-config.
>
> Cheers,
> -g
>
> On Wed, Dec 31, 2008 at 10:21, Arfrever Frehtes Taifersar Arahesis
> <Arfrever.FTA_at_gmail.com> wrote:
>> Author: arfrever
>> Date: Wed Dec 31 10:21:17 2008
>> New Revision: 34994
>>
>> Log:
>> Try to use `pkg-config neon` instead of `neon-config`.
>>
>> * build/ac-macros/neon.m4
>> (SVN_LIB_NEON, SVN_NEON_CONFIG): Try to use `pkg-config neon`.
>>
>> * configure.ac: Search for pkg-config before searching for Neon.
>>
>> Modified:
>> trunk/build/ac-macros/neon.m4
>> trunk/configure.ac
>>
>> Modified: trunk/build/ac-macros/neon.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/neon.m4?pathrev=34994&r1=34993&r2=34994
>> ==============================================================================
>> --- trunk/build/ac-macros/neon.m4 Wed Dec 31 09:56:10 2008 (r34993)
>> +++ trunk/build/ac-macros/neon.m4 Wed Dec 31 10:21:17 2008 (r34994)
>> @@ -36,7 +36,11 @@ AC_DEFUN(SVN_LIB_NEON,
>> look for neon-config in $PATH.]),
>> [
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-neon requires an argument.])
>> + if test "$HAVE_PKG_CONFIG" = "yes" && pkg-config neon --exists ; then
>> + NEON_PKG_CONFIG="yes"
>> + else
>> + AC_MSG_ERROR([--with-neon requires an argument.])
>> + fi
>> else
>> neon_config="$withval/bin/neon-config"
>> fi
>> @@ -113,7 +117,11 @@ dnl Configure neon ---------------------
>>
>> else
>> # no --with-neon switch, and no neon subdir, look in PATH
>> - AC_PATH_PROG(neon_config,neon-config)
>> + if test "$HAVE_PKG_CONFIG" = "yes" && pkg-config neon --exists ; then
>> + NEON_PKG_CONFIG="yes"
>> + else
>> + AC_PATH_PROG(neon_config,neon-config)
>> + fi
>> SVN_NEON_CONFIG()
>> fi
>>
>> @@ -127,10 +135,14 @@ dnl SVN_NEON_CONFIG()
>> dnl neon-config found, gather relevant information from it
>> AC_DEFUN(SVN_NEON_CONFIG,
>> [
>> - if test -f "$neon_config"; then
>> - if test "$neon_config" != ""; then
>> + if test "$NEON_PKG_CONFIG" = "yes" || test -f "$neon_config"; then
>> + if test "$NEON_PKG_CONFIG" = "yes" || test "$neon_config" != ""; then
>> AC_MSG_CHECKING([neon library version])
>> - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
>> + if test "$NEON_PKG_CONFIG" = "yes" ; then
>> + NEON_VERSION=`pkg-config neon --modversion`
>> + else
>> + NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
>> + fi
>> AC_MSG_RESULT([$NEON_VERSION])
>>
>> if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-9]\.'`"] ; then
>> @@ -152,9 +164,32 @@ AC_DEFUN(SVN_NEON_CONFIG,
>> if test -n "`echo "$NEON_VERSION" | grep "^$svn_allowed_neon"`" ||
>> test "$svn_allowed_neon" = "any"; then
>> svn_allowed_neon_on_system="yes"
>> - SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
>> - NEON_LIBS=`$neon_config --la-file`
>> - CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
>> + if test "$NEON_PKG_CONFIG" = "yes"; then
>> + SVN_NEON_INCLUDES=[`pkg-config neon --cflags | sed -e 's/-D[^ ]*//g'`]
>> + CFLAGS=["$CFLAGS `pkg-config neon --cflags | sed -e 's/-I[^ ]*//g'`"]
>> + old_CFLAGS="$CFLAGS"
>> + old_LIBS="$LIBS"
>> + NEON_LIBS=`pkg-config neon --libs`
>> + CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
>> + LIBS="$LIBS $NEON_LIBS"
>> + neon_test_code="
>> +#include <ne_compress.h>
>> +#include <ne_xml.h>
>> +int main()
>> +{ne_xml_create(); ne_decompress_destroy(NULL);}"
>> + AC_LINK_IFELSE([$neon_test_code], shared_linking="yes", shared_linking="no")
>> + if test "$shared_linking" = "no"; then
>> + NEON_LIBS=`pkg-config neon --libs --static`
>> + LIBS="$LIBS $NEON_LIBS"
>> + AC_LINK_IFELSE([$neon_test_code], , AC_MSG_ERROR([cannot find Neon]))
>> + fi
>> + CFLAGS="$old_CFLAGS"
>> + LIBS="$old_LIBS"
>> + else
>> + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
>> + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
>> + NEON_LIBS=`$neon_config --la-file`
>> + fi
>> svn_lib_neon="yes"
>> break
>> fi
>>
>> Modified: trunk/configure.ac
>> URL: http://svn.collab.net/viewvc/svn/trunk/configure.ac?pathrev=34994&r1=34993&r2=34994
>> ==============================================================================
>> --- trunk/configure.ac Wed Dec 31 09:56:10 2008 (r34993)
>> +++ trunk/configure.ac Wed Dec 31 10:21:17 2008 (r34994)
>> @@ -68,6 +68,9 @@ APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-
>> SVN_LIB_APR($APR_VER_REGEXES)
>> SVN_LIB_APRUTIL($APU_VER_REGEXES)
>>
>> +dnl Search for pkg-config
>> +AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
>> +
>> # Either a space-separated list of allowable Neon versions, or "any" to
>> # mean allow anything.
>> NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28"
>> @@ -326,11 +329,6 @@ AC_PREPROC_IFELSE([
>> CPPFLAGS="$old_CPPFLAGS"
>>
>>
>> -dnl pkg-config (required for support for KWallet and GNOME Keyring) -------------------
>> -
>> -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
>> -
>> -
>> dnl D-Bus (required for support for KWallet and GNOME Keyring) -------------------
>>
>> if test "$HAVE_PKG_CONFIG" = "yes"; then
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=997088
>>
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=997114
Received on 2008-12-31 20:06:50 CET

This is an archived mail posted to the Subversion Dev mailing list.