[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-04-13 21:09:21
Message-ID: 20050413210921.67D6A492 () office ! kde ! org
[Download RAW message or body]

CVS commit by marchand: 

<adymo> mikmak: please commit your fix ;)
=> Order received Sir ;)

fix compilation on kdelibs 3.3 without subversion (going to be backported)


  M +1 -1      configure.in.in   1.92
  M +2 -1      kdevelop.m4.in   1.45


--- kdevelop/kdevelop.m4.in  #1.44:1.45
@@ -685,5 +685,5 @@
             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
@@ -773,4 +773,5 @@
       AC_MSG_RESULT(yes)
     else
+      DISABLE_SUBVERSION="yes"
       AC_MSG_RESULT(no)
     fi

--- kdevelop/configure.in.in  #1.91:1.92
@@ -105,5 +105,5 @@
 
 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" )  
 


[prev in list] [next in list] [prev in thread] [next in thread]