Re: [systemd-devel] [PATCH] Fix build without blkid

2013-09-10 Thread Lennart Poettering
On Mon, 26.08.13 13:06, Chengwei Yang (chengwei.y...@intel.com) wrote:

 build systemd-gpt-auto-generator only if have blkid, otherwise, it will
 fail.

Tahnks! Already fixed now, with a pretty much identical patch from Marcel.

 ---
  Makefile.am |2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Makefile.am b/Makefile.am
 index fd38e82..5654ad3 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1708,6 +1708,7 @@ bin_PROGRAMS += \
   bootctl
  endif
  
 +if HAVE_BLKID
  # 
 --
  systemgenerator_PROGRAMS +=  \
   systemd-gpt-auto-generator
 @@ -1725,6 +1726,7 @@ systemd_gpt_auto_generator_LDADD = \
  systemd_gpt_auto_generator_CFLAGS = \
   $(AM_CFLAGS) \
   $(BLKID_CFLAGS)
 +endif
  
  # 
 --
  systemd_rc_local_generator_SOURCES = \


Lennart

-- 
Lennart Poettering - Red Hat, Inc.
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH] Fix build without blkid

2013-08-25 Thread Chengwei Yang
build systemd-gpt-auto-generator only if have blkid, otherwise, it will
fail.
---
 Makefile.am |2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index fd38e82..5654ad3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1708,6 +1708,7 @@ bin_PROGRAMS += \
bootctl
 endif
 
+if HAVE_BLKID
 # 
--
 systemgenerator_PROGRAMS +=  \
systemd-gpt-auto-generator
@@ -1725,6 +1726,7 @@ systemd_gpt_auto_generator_LDADD = \
 systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
+endif
 
 # 
--
 systemd_rc_local_generator_SOURCES = \
-- 
1.7.9.5

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel