patches/anjuta-02-svn-apr.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2545 f716f6bcaf7e
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2545
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     1
commit b63f50ed877eeb50334dc7fd1315c9ff8fec570a
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     2
Author: Halton Huo <[email protected]>
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     3
Date:   Thu Apr 29 16:09:47 2010 +0800
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     4
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     5
    Add APR_UTILS to subversion CFLAGS and LIBS
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     6
    
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     7
    https://bugzilla.gnome.org/show_bug.cgi?id=617149
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     8
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
     9
diff --git a/configure.in b/configure.in
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    10
index 42ef0da..3ba82e9 100644
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    11
--- a/configure.in
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    12
+++ b/configure.in
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    13
@@ -717,11 +717,11 @@ dnl ------------------------------------------
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    14
 if test -n "$SVN_INCLUDE" ; then
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    15
 	SVN_INCLUDE="-I$SVN_INCLUDE"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    16
 	if test x != "x$SVN_LIB" ; then
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    17
-	    SVN_LIB="-L$SVN_LIB $APR_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    18
+	    SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    19
 	else
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    20
-	    SVN_LIB="$APR_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    21
+	    SVN_LIB="$APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    22
 	fi
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    23
-	SVN_CFLAGS="$APR_CFLAGS $NEON_CFLAGS"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    24
+	SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS"
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    25
 fi
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    26
 
f716f6bcaf7e 2010-04-29 Halton Huo <[email protected]>
nonsea
parents:
diff changeset
    27
 AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])