[Pkg-libvirt-commits] [libguestfs] 52/116: Rename LIBNCURSES* to LIBTINFO*.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.29.10-1
in repository libguestfs.

commit 34d685157459c9a649179ae4b313f8b3576696f4
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Nov 13 13:22:21 2014 +0000

    Rename LIBNCURSES* to LIBTINFO*.
    
    We actually depend on libtinfo or libtermcap, not curses, so
    rename the variable.
    
    This updates commit 96add4d5b34daabbae5a2766f564ae98b48cf576.
---
 builder/Makefile.am   | 4 ++--
 configure.ac          | 8 ++++----
 customize/Makefile.am | 2 +-
 mllib/Makefile.am     | 6 +++---
 resize/Makefile.am    | 2 +-
 sparsify/link.sh.in   | 2 +-
 sysprep/Makefile.am   | 2 +-
 v2v/link.sh.in        | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/builder/Makefile.am b/builder/Makefile.am
index e64a696..a78eb37 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -25,7 +25,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/fish \
 	-pthread \
 	$(LIBLZMA_CFLAGS) \
-	$(LIBCURSES_CFLAGS)
+	$(LIBTINFO_CFLAGS)
 
 EXTRA_DIST = \
 	$(SOURCES) \
@@ -173,7 +173,7 @@ OCAMLCLIBS  = \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu \
 	-pthread -lpthread \
-	$(LIBCURSES_LIBS) -lcrypt
+	$(LIBTINFO_LIBS) -lcrypt
 
 if HAVE_OCAMLOPT
 virt-builder: $(OBJECTS)
diff --git a/configure.ac b/configure.ac
index 1c38084..5070922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,11 +354,11 @@ struct sockaddr_un myaddr;
 
 dnl tgetent, tputs and UP [sic] are all required.  They come from the lower
 dnl tinfo library, but might be part of ncurses directly.
-PKG_CHECK_MODULES([LIBCURSES], [tinfo], [], [
-    PKG_CHECK_MODULES([LIBCURSES], [ncurses])
+PKG_CHECK_MODULES([LIBTINFO], [tinfo], [], [
+    PKG_CHECK_MODULES([LIBTINFO], [ncurses])
 ])
-AC_SUBST([LIBCURSES_CFLAGS])
-AC_SUBST([LIBCURSES_LIBS])
+AC_SUBST([LIBTINFO_CFLAGS])
+AC_SUBST([LIBTINFO_LIBS])
 
 dnl GNU gettext tools (optional).
 AC_CHECK_PROG([XGETTEXT],[xgettext],[xgettext],[no])
diff --git a/customize/Makefile.am b/customize/Makefile.am
index 64509fd..515516a 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) $(LIBTINFO_LIBS) -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu
 
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index 112b610..e695444 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -99,7 +99,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) $(LIBTINFO_LIBS) -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu
 
@@ -154,11 +154,11 @@ check_SCRIPTS = common_utils_tests
 if HAVE_OCAMLOPT
 common_utils_tests: common_gettext.cmx tty-c.o tTY.cmx common_utils.cmx common_utils_tests.cmx
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
-	  mlguestfs.cmxa -linkpkg $^ -cclib $(LIBCURSES_LIBS) -o $@
+	  mlguestfs.cmxa -linkpkg $^ -cclib $(LIBTINFO_LIBS) -o $@
 else
 common_utils_tests: common_gettext.cmo tty-c.o tTY.cmo common_utils.cmo common_utils_tests.cmo
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
-	  mlguestfs.cma -linkpkg $^ -cclib $(LIBCURSES_LIBS) -custom -o $@
+	  mlguestfs.cma -linkpkg $^ -cclib $(LIBTINFO_LIBS) -custom -o $@
 endif
 
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 3030366..e1c8dbe 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -71,7 +71,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) \
+	$(LIBXML2_LIBS) $(LIBINTL) $(LIBTINFO_LIBS) \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu
 
diff --git a/sparsify/link.sh.in b/sparsify/link.sh.in
index 5d69237..9892b07 100644
--- a/sparsify/link.sh.in
+++ b/sparsify/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 '@LIBCURSES_LIBS@'
+exec "$@" -linkpkg -cclib '@LIBTINFO_LIBS@'
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index 086f14c..63db371 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -136,7 +136,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) $(LIBTINFO_LIBS) -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu
 
diff --git a/v2v/link.sh.in b/v2v/link.sh.in
index 7ac7ee6..79dc847 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 @LIBCURSES_LIBS@ -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu'
+exec "$@" -linkpkg -cclib '-lutils @LIBTINFO_LIBS@ -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git