Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 157 insertions, 0 deletions

diff --git a/kioslave/svn/configure.in.in b/kioslave/svn/configure.in.in
new file mode 100644
index 00000000..9e962c08
--- /dev/null
+++ b/kioslave/svn/configure.in.in
@@ -0,0 +1,157 @@
+AC_ARG_WITH(subversion,
+  [AC_HELP_STRING(--with-subversion,
+    [enable support for subversion @<:@default=check@:>@])],
+  [], with_subversion=check)
+
+SVN_SUBDIR=""
+if test "x$with_subversion" != xno; then
+
+APR_CONFIGS="apr-config apr-1-config /usr/local/apr/bin/apr-config"
+SVN_SUBDIR="svn"
+AC_ARG_WITH(apr-config,
+[[  --with-apr-config=FILE    Use the given path to apr-config when determining
+                            APR configuration; defaults to "apr-config"]],
+[
+    if test "$withval" != "yes" -a "$withval" != ""; then
+        APR_CONFIGS=$withval
+    fi
+])
+AC_MSG_CHECKING([for APR])
+APR_CONFIG=""
+for VALUE in $APR_CONFIGS ; do
+	if $VALUE --cflags > /dev/null; then
+		APR_CONFIG=$VALUE
+		break
+	fi
+done
+test $VALUE && APR_CONFIG=$VALUE
+if test $APR_CONFIG ; then
+    AC_MSG_RESULT([found])
+else
+    AC_MSG_RESULT([not found])
+	SVN_SUBDIR=
+dnl    AC_MSG_ERROR([APR is required. Try --with-apr-config.])
+fi
+	
+APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
+APR_INCLUDE="`$APR_CONFIG --includes`"
+APR_LIBS="`$APR_CONFIG --link-ld --libs`"
+
+dnl
+dnl APR util
+dnl
+
+APU_CONFIGS="apu-config apu-1-config /usr/local/apr/bin/apu-config"
+AC_ARG_WITH(apu-config,
+[[  --with-apu-config=FILE    Use the given path to apu-config when determining
+                            APR util configuration; defaults to "apu-config"]],
+[
+    if test "$withval" != "yes" -a "$withval" != ""; then
+        APU_CONFIGS=$withval
+    fi
+])
+AC_MSG_CHECKING([for APR util])
+APU_CONFIG=""
+for VALUE in $APU_CONFIGS ; do
+	if $VALUE --includes > /dev/null; then
+		APU_CONFIG=$VALUE
+		break
+	fi
+done
+if test $APU_CONFIG ; then
+    AC_MSG_RESULT([found])
+else
+    AC_MSG_RESULT([not found])
+	SVN_SUBDIR=
+dnl    AC_MSG_ERROR([APR util is required. Try --with-apu-config.])
+fi
+dnl APR_CPPFLAGS="$APR_CPPFLAGS `$APU_CONFIG --includes`"
+APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
+APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
+
+AC_MSG_CHECKING(for Subversion svn-config)
+AC_ARG_WITH(subversion-dir,
+	 [  --with-subversion-dir=DIR           where Subversion is installed ],
+	 [
+		 SVNCONFIG="$withval/bin/svn-config"
+	])
+
+if test -z "$SVNCONFIG"; then
+	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
+	if test -n "$_SVNCONFIG"; then
+		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
+	fi
+fi
+
+AC_SUBST(SVNCONFIG)
+if test -x "$SVNCONFIG"; then
+	SVNLD="`$SVNCONFIG --ldflags`"
+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
+	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
+	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(not found)
+	SVNLD=""
+	dnl just a fallback to debian's config so that it works for me :)
+	SVN_INCLUDES="/usr/local/include /usr/include"
+	AC_ARG_WITH(svn-include,
+				[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
+				[
+				 if test "$withval" != "yes" -a "$withval" != ""; then
+					 SVN_INCLUDES=$withval
+				 fi
+				 ])
+	AC_MSG_CHECKING([for Subversion headers])
+	SVN_INCLUDE=""
+	for VALUE in $SVN_INCLUDES ; do
+		if test -f $VALUE/subversion-1/svn_types.h ; then
+			SVN_INCLUDE="-I$VALUE"
+			break
+		fi
+	done
+	if test $SVN_INCLUDE ; then
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+		SVN_SUBDIR=
+dnl		AC_MSG_ERROR([Subversion headers are required. Try --with-svn-include.])
+	fi
+	SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
+	AC_ARG_WITH(svn-lib,
+			[[  --with-svn-lib=DIR  Use the given path to the subversion libraries.]],
+			[
+			     if test "$withval" != "yes" -a "$withval" != ""; then
+			         SVN_LIBS=$withval
+			     fi
+			 ])
+	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
+			SVN_LIB="-L$VALUE"
+			break
+		fi
+	done
+	if test $SVN_LIB ; then
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+		SVN_SUBDIR=
+	fi
+fi
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
+SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+
+if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
+  AC_MSG_ERROR([--with-subversion was given, but test for subversion failed])
+fi
+fi
+
+AC_SUBST(SVN_INCLUDE)
+AC_SUBST(SVN_LIB)
+AC_SUBST(SVN_CPPFLAGS)
+AC_SUBST(SVNLD)
+AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR")