compile fix kdelibs 3.3

[Mickael Marchand]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

it's a compile fix for kdevelop on kdelibs 3.3 when you don't have
subversion headers/libs installed ;) (tricky no ? :)

I also backported a change from kdesdk to avoid a '1' file to be created :)

is it ok to commit ?

Mik


Index: kdevelop.m4.in
===================================================================
RCS file: /home/kde/kdevelop/kdevelop.m4.in,v
retrieving revision 1.44
diff -u -3 -p -u -r1.44 kdevelop.m4.in
- --- kdevelop.m4.in      10 Mar 2005 21:46:31 -0000      1.44
+++ kdevelop.m4.in      13 Apr 2005 20:10:01 -0000
@@ -684,7 +684,7 @@ AC_DEFUN([KDEV_CHECK_SVN],
             AC_MSG_CHECKING([for Subversion libraries])
             SVN_LIB=""
             for VALUE in $SVN_LIBS ; do
- -                    if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
+                    if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
                             SVN_LIB=$VALUE
                             break
                     fi
@@ -772,6 +772,7 @@ AC_DEFUN([KDEV_CHECK_VCSCOMPAT],
       VCSCOMPAT=vcscompat
       AC_MSG_RESULT(yes)
     else
+      DISABLE_SUBVERSION="yes"
       AC_MSG_RESULT(no)
     fi
   fi
Index: configure.in.in
===================================================================
RCS file: /home/kde/kdevelop/configure.in.in,v
retrieving revision 1.91
diff -u -3 -p -u -r1.91 configure.in.in
- --- configure.in.in     8 Mar 2005 12:23:14 -0000       1.91
+++ configure.in.in     13 Apr 2005 20:10:01 -0000
@@ -104,7 +104,7 @@ AC_ARG_ENABLE(perforce, AC_HELP_STRING([
 AM_CONDITIONAL(include_perforce, test "$with_perforce" = "yes")

 AC_ARG_ENABLE(subversion, AC_HELP_STRING([--disable-subversion],
[disable vcs support for subversion]), [with_subversion=${enableval}],
[with_subversion=yes])
- -AM_CONDITIONAL(include_subversion, test "$with_subversion" = "yes")
+AM_CONDITIONAL(include_subversion, test "$with_subversion" = "yes" -a
"$DISABLE_SUBVERSION" != "yes" )


 dnl  **********
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCXX5YyOYzc4nQ8j0RAqV/AJ4jBOnPJn0TQ3/XTMFf9ta6hr2XdwCfabgc
Qw6huIbgis5NeHJG4TqakFo=
=JYuE
-----END PGP SIGNATURE-----