summaryrefslogtreecommitdiffstats
path: root/resize/Makefile.am
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-11-03 10:45:58 +0000
committerRichard W.M. Jones <rjones@redhat.com>2011-11-03 10:46:50 +0000
commitffbafadcb8dfebcaba529cb8d7e2da52dd032d8a (patch)
treeca7e095c997d061cfae5e569921965418a02a26e /resize/Makefile.am
parent63898268101e5ec91c8dac46651dbee5976272ce (diff)
downloadlibguestfs-ffbafadcb8dfebcaba529cb8d7e2da52dd032d8a.tar.gz
libguestfs-ffbafadcb8dfebcaba529cb8d7e2da52dd032d8a.tar.xz
libguestfs-ffbafadcb8dfebcaba529cb8d7e2da52dd032d8a.zip
resize: Remove requirement for ocaml Pcre library.
This library is not available in RHEL 6, and in any case removing the dependency is a simple change.
Diffstat (limited to 'resize/Makefile.am')
-rw-r--r--resize/Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 32c5325c..69103d68 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -25,7 +25,6 @@ EXTRA_DIST = \
CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img
if HAVE_OCAML
-if HAVE_OCAML_PCRE
# Alphabetical order.
SOURCES = \
@@ -49,7 +48,7 @@ bin_SCRIPTS = virt-resize
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
-OCAMLPACKAGES = -package pcre -I $(top_builddir)/src/.libs -I ../ocaml
+OCAMLPACKAGES = -package str -I $(top_builddir)/src/.libs -I ../ocaml
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@@ -124,7 +123,6 @@ include .depend
.PHONY: depend docs
endif
-endif
# Parallel builds don't obey dependencies for some reason we
# don't understand.