Author: stsp
Date: Mon Sep 17 16:29:25 2012
New Revision: 1386696
URL: http://svn.apache.org/viewvc?rev=1386696&view=rev
Log:
* configure.ac: Don't raise a fatal error if --with-gnome-kerying was passed
but the necessary things can't be found. Just print a warning and move on
without compiling GNOME Kerying support.
Modified:
subversion/trunk/configure.ac
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1386696&r1=1386695&r2=1386696&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Sep 17 16:29:25 2012
@@ -587,17 +587,16 @@ if test "$with_gnome_keyring" != "no"; t
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0
gnome-keyring-1`"
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find GNOME Keyring])
fi
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
+ AC_MSG_WARN([cannot find GLib and GNOME Keyring .pc files. GNOME
Keyring disabled.])
fi
else
- AC_MSG_ERROR([cannot find pkg-config])
+ AC_MSG_WARN([cannot find pkg-config. GNOME Keyring disabled.])
fi
else
- AC_MSG_ERROR([APR does not have support for DSOs])
+ AC_MSG_WARN([APR does not have support for DSOs. GNOME Keyring
disabled.])
fi
else
AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
