* [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: sane-backends-1.0.24-systemd_pkgconfig.patch
@ 2014-03-03 16:50 Christopher Brannon (teiresias)
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Brannon (teiresias) @ 2014-03-03 16:50 UTC (permalink / raw
To: gentoo-commits
teiresias 14/03/03 16:50:33
Added: sane-backends-1.0.24-systemd_pkgconfig.patch
Log:
Use pkg-config when linking against systemd (bug #502422).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Revision Changes Path
1.1 media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.1&content-type=text/plain
Index: sane-backends-1.0.24-systemd_pkgconfig.patch
===================================================================
diff --git a/configure.in b/configure.in
index 7413646..2c05265 100644
--- a/configure.in
+++ b/configure.in
@@ -347,17 +347,11 @@ dnl fi
AC_ARG_WITH(systemd,
AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
if test "x$with_systemd" != xno ; then
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
- $as_echo_n "Checking for systemd..."
- if test -e /usr/include/systemd/sd-daemon.h ; then
+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd libsystemd-daemon], have_systemd=yes, have_systemd=no)
+ if test "x$have_systemd" = xyes; then
AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
- have_systemd="yes"
- SYSTEMD_LIBS=" -lsystemd-daemon"
AC_SUBST(SYSTEMD_LIBS)
- $as_echo "yes"
else
- have_systemd="no"
- $as_echo "no"
if test "x$with_systemd" = xyes; then
AC_MSG_ERROR([Systemd support was requested but systemd was not found])
fi
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: sane-backends-1.0.24-systemd_pkgconfig.patch
@ 2014-03-03 19:00 Christopher Brannon (teiresias)
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Brannon (teiresias) @ 2014-03-03 19:00 UTC (permalink / raw
To: gentoo-commits
teiresias 14/03/03 19:00:09
Modified: sane-backends-1.0.24-systemd_pkgconfig.patch
Log:
Fix build failures caused by an incorrect patch.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Revision Changes Path
1.2 media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?r1=1.1&r2=1.2
Index: sane-backends-1.0.24-systemd_pkgconfig.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.24-systemd_pkgconfig.patch 3 Mar 2014 16:50:33 -0000 1.1
+++ sane-backends-1.0.24-systemd_pkgconfig.patch 3 Mar 2014 19:00:09 -0000 1.2
@@ -1,24 +1,37 @@
diff --git a/configure.in b/configure.in
-index 7413646..2c05265 100644
+index 7413646..66828fc 100644
--- a/configure.in
+++ b/configure.in
-@@ -347,17 +347,11 @@ dnl fi
+@@ -347,21 +347,18 @@ dnl fi
AC_ARG_WITH(systemd,
AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
if test "x$with_systemd" != xno ; then
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
- $as_echo_n "Checking for systemd..."
- if test -e /usr/include/systemd/sd-daemon.h ; then
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd libsystemd-daemon], have_systemd=yes, have_systemd=no)
-+ if test "x$have_systemd" = xyes; then
- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
+- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
- have_systemd="yes"
- SYSTEMD_LIBS=" -lsystemd-daemon"
- AC_SUBST(SYSTEMD_LIBS)
+- AC_SUBST(SYSTEMD_LIBS)
- $as_echo "yes"
- else
+- else
- have_systemd="no"
- $as_echo "no"
- if test "x$with_systemd" = xyes; then
- AC_MSG_ERROR([Systemd support was requested but systemd was not found])
- fi
+- if test "x$with_systemd" = xyes; then
+- AC_MSG_ERROR([Systemd support was requested but systemd was not found])
+- fi
++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no)
++ if test "x$have_systemd" = xno; then
++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no)
++ fi
++ if test "x$have_systemd" = xyes; then
++ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
++ AC_SUBST(SYSTEMD_LIBS)
++ else
++ if test "x$with_systemd" = xyes; then
++ AC_MSG_ERROR([Systemd support was requested but systemd was not found])
+ fi
++ fi
+ fi
+
+ dnl ***********
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-03 19:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-03 19:00 [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: sane-backends-1.0.24-systemd_pkgconfig.patch Christopher Brannon (teiresias)
-- strict thread matches above, loose matches on Subject: below --
2014-03-03 16:50 Christopher Brannon (teiresias)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox