[arch-commits] Commit in libsignon-glib/trunk (2 files)
Balló György
bgyorgy at nymeria.archlinux.org
Sat Jan 26 14:45:09 UTC 2013
Date: Saturday, January 26, 2013 @ 15:45:09
Author: bgyorgy
Revision: 83005
Remove obsoleted patches
Deleted:
libsignon-glib/trunk/fix-docdir.patch
libsignon-glib/trunk/make-tests-optional.patch
---------------------------+
fix-docdir.patch | 12 --------
make-tests-optional.patch | 61 --------------------------------------------
2 files changed, 73 deletions(-)
Deleted: fix-docdir.patch
===================================================================
--- fix-docdir.patch 2013-01-26 14:44:32 UTC (rev 83004)
+++ fix-docdir.patch 2013-01-26 14:45:09 UTC (rev 83005)
@@ -1,12 +0,0 @@
-diff -Naur libsignon-glib-1.6.orig/Makefile.am libsignon-glib-1.6/Makefile.am
---- libsignon-glib-1.6.orig/Makefile.am 2012-08-13 10:09:23.000000000 +0200
-+++ libsignon-glib-1.6/Makefile.am 2012-10-16 22:04:28.805736477 +0200
-@@ -11,7 +11,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
-
--libsignondocdir = ${prefix}/doc/reference
-+libsignondocdir = ${docdir}
- libsignondoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
-
- EXTRA_DIST = \
Deleted: make-tests-optional.patch
===================================================================
--- make-tests-optional.patch 2013-01-26 14:44:32 UTC (rev 83004)
+++ make-tests-optional.patch 2013-01-26 14:45:09 UTC (rev 83005)
@@ -1,61 +0,0 @@
-commit 65e1948097695f26aa13f4104336a8a76a678b87
-Author: David King <david.king at canonical.com>
-Date: Tue Oct 30 09:24:27 2012 +0000
-
- Make tests optional at configure time
-
- http://code.google.com/p/accounts-sso/issues/detail?id=124
-
-diff --git a/Makefile.am b/Makefile.am
-index 86b3a55..5740d45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = \
- --enable-gtk-doc \
- --enable-introspection=yes
--SUBDIRS = libsignon-glib docs tests
-+SUBDIRS = libsignon-glib docs
-
- if ENABLE_PYTHON
- SUBDIRS += pygobject
- endif
-
-+if ENABLE_TESTS
-+SUBDIRS += tests
-+endif
-+
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
-
-diff --git a/configure.ac b/configure.ac
-index af5e663..d09661e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,25 @@ PKG_CHECK_MODULES(
- AC_SUBST(DEPS_CFLAGS)
- AC_SUBST(DEPS_LIBS)
-
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+# Build tests.
-+
-+CHECK_REQUIRED="check >= 0.9.4"
-+
-+AC_ARG_ENABLE([tests],
-+ [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
-+
-+AS_IF([test "x$enable_tests" != "xno"],
-+ [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
-+ [have_check=no])
-+
-+AS_IF([test "x$have_check" = "xyes"],
-+ [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
-+ AC_SUBST([CHECK_CFLAGS])
-+ AC_SUBST([CHECK_LIBS])],
-+ [AS_IF([test "x$enable_tests" = "xyes"],
-+ [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
-+
-+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
-
- AC_ISC_POSIX
- AC_PROG_CC
More information about the arch-commits
mailing list