summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-08-28 19:11:39 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-08-30 22:39:48 +0100
commitb8e83a347f19890ed8a8c40a60f997cc33719476 (patch)
treeb75eb7f1ba70131b18a027cb09bf85059bea2163
parent372f2888606ee6873955b864beec56e00e607ef7 (diff)
downloadlibguestfs-b8e83a347f19890ed8a8c40a60f997cc33719476.tar.gz
libguestfs-b8e83a347f19890ed8a8c40a60f997cc33719476.tar.xz
libguestfs-b8e83a347f19890ed8a8c40a60f997cc33719476.zip
lib: Remove AUGEAS_CFLAGS, AUGEAS_LIBS.
The library doesn't actually use libaugeas, except indirectly via the libguestfs API. The libguestfs API implements this in the daemon, so there's no need for the library to link to augeas at all. (cherry picked from commit 228d49bb842cda517b414bbfab460e8be429cc5f)
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ce01090..499b7004 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,7 +144,7 @@ libguestfs_la_SOURCES = \
libguestfs.syms
libguestfs_la_LIBADD = \
- $(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
+ $(HIVEX_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
../gnulib/lib/libgnu.la \
$(GETADDRINFO_LIB) \
@@ -163,7 +163,7 @@ libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
libguestfs_la_CFLAGS = \
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
-DGUESTFS_WARN_DEPRECATED=1 \
- $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
+ $(HIVEX_CFLAGS) $(PCRE_CFLAGS) \
$(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
$(GCC_VISIBILITY_HIDDEN)