git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: Make pcre, libmagic and hivex libraries optional.
[libguestfs.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
f23464e
..
4be61a5
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-128,12
+128,14
@@
libguestfs_la_SOURCES = \
actions.c \
appliance.c \
bindtests.c \
actions.c \
appliance.c \
bindtests.c \
+ filearch.c \
inspect.c \
launch.c \
inspect.c \
launch.c \
+ listfs.c \
proto.c \
libguestfs.syms
proto.c \
libguestfs.syms
-libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(
LIBPCRE) $(LIBMAGIC
) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(
PCRE_LIBS) $(MAGIC_LIBS
) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
# Make libguestfs include the convenience libraries.
noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
# Make libguestfs include the convenience libraries.
noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
@@
-141,7
+143,7
@@
libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
libguestfs_la_CFLAGS = \
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
libguestfs_la_CFLAGS = \
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
- $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \
+ $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS)
$(PCRE_CFLAGS)
\
$(WARN_CFLAGS) $(WERROR_CFLAGS)
libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
$(WARN_CFLAGS) $(WERROR_CFLAGS)
libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib