search for: libtinfo_lib

Mac OS X uses DYLD_LIBRARY_PATH rather than LD_LIBRARY_PATH. --- run.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/run.in b/run.in index a8c2904..bf7ea1b 100755 --- a/run.in +++ b/run.in @@ -77,13 +77,10 @@ fi

...n index 59f3c6f..964617f 100644 --- a/builder/link.sh.in +++ b/builder/link.sh.in @@ -19,4 +19,4 @@ # Hack automake to link binary properly. There is no other way to add # the -cclib parameter to the end of the command line. -exec "$@" -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ -lcrypt @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' +exec "$@" -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ @LIBCRYPT_LIBS@ @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' diff --git a/configure.ac b/configure.ac index d68190a..9d95c2c 100644 --- a/configure...

...hel-6.5.img diff --git a/builder/Makefile.am b/builder/Makefile.am index bfe2f79..182f5a4 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -150,6 +150,16 @@ if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif +OCAMLCLIBS = \ + -pthread -lpthread \ + -lutils \ + $(LIBTINFO_LIBS) \ + $(LIBCRYPT_LIBS) \ + $(LIBLZMA_LIBS) \ + $(LIBXML2_LIBS) \ + $(LIBINTL) \ + -lgnu + OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) if !HAVE_OCAMLOPT @@ -162,9 +172,9 @@ BEST = opt OCAMLLINKFLAGS = mlguestfs.cmxa endif -virt_builder_DEPENDENCIES = $(OBJECTS) +virt_builder_DEPENDENC...

...ls_tests_XOBJECTS) common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) -common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx - $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ - mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@ +JSON_tests_THEOBJECTS = $(JSON_tests_XOBJECTS) JSON_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) -JSON_tests: JSON.cmx JSON_tests.cmx - $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ - mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)...

...xa *.o @@ -139,11 +140,21 @@ common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@ + +JSON_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) +JSON_tests: JSON.cmx JSON_tests.cmx + $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ + mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@ else common_utils_tests.cmo: OCAMLPAC...

--- mllib/common_utils_tests.ml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mllib/common_utils_tests.ml b/mllib/common_utils_tests.ml index 09d5c51..283e9a1 100644 --- a/mllib/common_utils_tests.ml +++ b/mllib/common_utils_tests.ml @@ -27,6 +27,7 @@ let prog = "common_utils_tests" let assert_equal_string = assert_equal ~printer:(fun x -> x) let

...rectly. PKG_CHECK_MODULES([LIBTINFO], [tinfo], [], [ - PKG_CHECK_MODULES([LIBTINFO], [ncurses]) + PKG_CHECK_MODULES([LIBTINFO], [ncurses], [], [ + AC_CHECK_PROG([NCURSES6_CONFIG], [ncurses6-config], [ncurses6-config], [no]) + LIBTINFO_CFLAGS=`$NCURSES6_CONFIG --cflags` + LIBTINFO_LIBS=`$NCURSES6_CONFIG --libs` + ]) ]) AC_SUBST([LIBTINFO_CFLAGS]) AC_SUBST([LIBTINFO_LIBS]) -- 2.6.2

...CK_PROG([NCURSES_CONFIG], [ncurses5-config], [ncurses5-config], [no]) + fi + if test "x$NCURSES_CONFIG" == "xno"; then + AC_MSG_ERROR([ncurses development package is not installed]) + fi + LIBTINFO_CFLAGS=`$NCURSES_CONFIG --cflags` + LIBTINFO_LIBS=`$NCURSES_CONFIG --libs` + ]) ]) AC_SUBST([LIBTINFO_CFLAGS]) AC_SUBST([LIBTINFO_LIBS]) -- 2.6.2

...AC_CHECK_PROGS([NCURSES_CONFIG], [ncurses6-config ncurses5-config], [no]) + if test "x$NCURSES_CONFIG" == "xno"; then + AC_MSG_ERROR([ncurses development package is not installed]) + fi + LIBTINFO_CFLAGS=`$NCURSES_CONFIG --cflags` + LIBTINFO_LIBS=`$NCURSES_CONFIG --libs` + ]) ]) AC_SUBST([LIBTINFO_CFLAGS]) AC_SUBST([LIBTINFO_LIBS]) -- 2.6.2

Hi all, Here is version 2 of the patch series, including the changes for Pino's remarks. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++

It will be used for the OCaml unit tests. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index e0fb481..e360bbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1120,6 +1120,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ ]) OCAML_PKG_gettext=no +OCAML_PKG_oUnit=no AS_IF([test "x$OCAMLC" != "xno"],[ #

.../link.sh.in b/v2v/link.sh.in index 79dc847..3971d03 100644 --- a/v2v/link.sh.in +++ b/v2v/link.sh.in @@ -19,4 +19,4 @@ # Hack automake to link binary properly. There is no other way to add # the -cclib parameter to the end of the command line. -exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' +exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ @LCRYPT_FLAG@ @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' -- 1.9.3

...AMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx - $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) \ + $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ mlguestfs.cmxa -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -o $@ else +common_utils_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: common_gettext.cmo common_utils.cmo common_utils_tests.cmo - $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) \ + $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \...

Hey there! Here are a few patches to fix unrelated things: one fixes the configure for older ncurses releases having no pkg-config files. The other two are fixing what Richard mentioned about guestfs subvolumes display Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case

Hi there, Latest and greatest version including all new remarks from both Pino and Rich. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++ m4/guestfs_libraries.m4

...cmo \ - $(top_builddir)/customize/crypt.cmo \ - $(top_builddir)/customize/password.cmo \ - $(top_builddir)/customize/ssh_key.cmo \ - $(top_builddir)/customize/customize_run.cmo \ $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) @@ -162,8 +146,6 @@ endif OCAMLCLIBS = \ -lutils \ - $(LIBTINFO_LIBS) \ - $(LIBCRYPT_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(LIBINTL) \ -- 2.1.0

...trap and/or autogen.sh on more recent machine, since autotools on RHEL 5 is far too old. (This was easy for me because I was building on an NFS homedir shared between Fedora 25 and RHEL 5). Configure libguestfs like this: export vmchannel_test=no export LIBTINFO_CFLAGS=-D_GNU_SOURCE export LIBTINFO_LIBS=-lncurses export YAJL_CFLAGS=-D_GNU_SOURCE export YAJL_LIBS=-lyajl ./configure \ --prefix /usr \ --libdir /usr/lib64 \ --disable-static \ --disable-appliance --disable-daemon \ --disable-ocaml --disable-perl --disable-python --disable-ruby \ --disable-php --disable-l...

Make use of Unix.isatty instead of our TTY.isatty_stdout, as the supported OCaml provides the former already. --- mllib/common_utils.ml | 10 +++++----- mllib/progress.ml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 295981c..9fcd8dd 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -207,15 +207,15

...age str,unix \ -I $(top_builddir)/common/utils/.libs \ + -I $(top_builddir)/common/cleanups/.libs \ -I $(top_builddir)/lib/.libs \ -I $(top_builddir)/gnulib/lib/.libs \ -I $(top_builddir)/ocaml \ @@ -138,6 +140,7 @@ endif OCAMLCLIBS = \ -pthread -lpthread \ -lutils \ + -lcleanups \ $(LIBTINFO_LIBS) \ $(LIBCRYPT_LIBS) \ $(LIBLZMA_LIBS) \ @@ -344,6 +347,7 @@ virt_index_validate_CPPFLAGS = \ -I. \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/common/cleanups \ -I$(top_srcdir)/common/utils \ -I$(top_srcdir)/lib virt_index_validate...

...c6ccd..d689fa8 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -133,6 +133,7 @@ guestfish_CPPFLAGS = \ guestfish_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(RPC_CFLAGS) \ $(LIBCONFIG_CFLAGS) \ $(LIBXML2_CFLAGS) @@ -147,32 +148,23 @@ guestfish_LDADD = \ $(LIBREADLINE) \ $(LIBTINFO_LIBS) \ $(LTLIBINTL) \ + $(RPC_LIBS) \ -lm # Make guestfish use the convenience libraries. noinst_LTLIBRARIES = libcmds.la librc_protocol.la guestfish_LDADD += libcmds.la librc_protocol.la ../gnulib/lib/libgnu.la -if HAVE_RPCGEN -RPCGEN_DEFS = -if HAVE_XDR_U_INT64_T -RPCGEN_DEFS += -DHAVE_XD...