← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Max Bowsher
  • Date: 2012-10-25 00:08:47 UTC
  • mfrom: (44.1.49 precise)
  • Revision ID: _@maxb.eu-20121025000847-8xxg7ea4qdqio0w4
Tags: 1.7.7-0svn2~oneiric+svn1
Merge 1.7.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
532
532
CPPFLAGS="$old_CPPFLAGS"
533
533
 
534
534
 
535
 
dnl D-Bus (required for support for KWallet and GNOME Keyring) -------------------
 
535
dnl D-Bus (required for support for KWallet) -------------------
536
536
 
537
537
if test -n "$PKG_CONFIG"; then
538
538
  AC_MSG_CHECKING([for D-Bus .pc file])
582
582
  if test "$svn_enable_shared" = "yes"; then
583
583
    if test "$APR_HAS_DSO" = "yes"; then
584
584
      if test -n "$PKG_CONFIG"; then
585
 
        if test "$HAVE_DBUS" = "yes"; then
586
 
          AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
587
 
          if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
 
585
        AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
 
586
        if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
 
587
          AC_MSG_RESULT([yes])
 
588
          old_CPPFLAGS="$CPPFLAGS"
 
589
          SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
 
590
          CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
 
591
          AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, with_gnome_keyring=no)
 
592
          AC_MSG_CHECKING([for GNOME Keyring])
 
593
          if test "$with_gnome_keyring" = "yes"; then
588
594
            AC_MSG_RESULT([yes])
589
 
            old_CPPFLAGS="$CPPFLAGS"
590
 
            SVN_GNOME_KEYRING_INCLUDES="$DBUS_CPPFLAGS `$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
591
 
            CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
592
 
            AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, with_gnome_keyring=no)
593
 
            AC_MSG_CHECKING([for GNOME Keyring])
594
 
            if test "$with_gnome_keyring" = "yes"; then
595
 
              AC_MSG_RESULT([yes])
596
 
              AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
597
 
                        [Is GNOME Keyring support enabled?])
598
 
              CPPFLAGS="$old_CPPFLAGS"
599
 
              SVN_GNOME_KEYRING_LIBS="$DBUS_LIBS `$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
600
 
            else
601
 
              AC_MSG_RESULT([no])
602
 
              AC_MSG_ERROR([cannot find GNOME Keyring])
603
 
            fi
 
595
            AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
 
596
                      [Is GNOME Keyring support enabled?])
 
597
            CPPFLAGS="$old_CPPFLAGS"
 
598
            SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
604
599
          else
605
600
            AC_MSG_RESULT([no])
606
 
            AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
 
601
            AC_MSG_ERROR([cannot find GNOME Keyring])
607
602
          fi
608
603
        else
609
 
          AC_MSG_ERROR([cannot find D-Bus])
 
604
          AC_MSG_RESULT([no])
 
605
          AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
610
606
        fi
611
607
      else
612
608
        AC_MSG_ERROR([cannot find pkg-config])