build: check for libintl, and use it

Look for libint/gettext and link to it; this properly detects whether libint is part of libc.
2026-03-22 07:03:38 +00:00 · 2014-11-04 18:02:56 +01:00
parent c58d335952
commit a5426cce5f
26 changed files with 43 additions and 7 deletions
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -68,6 +68,7 @@ virt_alignment_scan_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la \
 	-lm

--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -168,6 +168,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 OCAMLCLIBS  = \
 	$(LIBLZMA_LIBS) \
 	$(LIBXML2_LIBS) \
+	$(LIBINTL) \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu \
 	-pthread -lpthread \
@@ -299,6 +300,7 @@ virt_index_validate_CPPFLAGS = \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\"

 virt_index_validate_LDADD = \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 man_MANS += virt-index-validate.1
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -66,6 +66,7 @@ virt_cat_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_filesystems_SOURCES = \
@@ -88,6 +89,7 @@ virt_filesystems_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_log_SOURCES = \
@@ -110,6 +112,7 @@ virt_log_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 virt_ls_SOURCES = \
@@ -134,6 +137,7 @@ virt_ls_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/configure.ac
+++ b/configure.ac
@@ -383,6 +383,9 @@ AC_MSG_RESULT([$msgfmt_is_gnu])
 AM_CONDITIONAL([HAVE_GNU_GETTEXT],
    [test "x$XGETTEXT" != "xno" && test "x$MSGCAT" != "xno" && test "x$MSGFMT" != "xno" && test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "xno"])

+dnl Check for gettext.
+AM_GNU_GETTEXT([external])
+
 dnl Default backend.
 AC_MSG_CHECKING([if the user specified a default backend])
 AC_ARG_WITH([default-backend],
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)

 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) -lncurses -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu

--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -71,6 +71,7 @@ virt_df_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la \
 	-lm

--- a/diff/Makefile.am
+++ b/diff/Makefile.am
@@ -56,6 +56,7 @@ virt_diff_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -61,6 +61,7 @@ virt_edit_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -71,6 +71,7 @@ erl_guestfs_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 TESTS_ENVIRONMENT = $(top_builddir)/run --test
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -144,6 +144,7 @@ guestfish_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(top_builddir)/src/libutils.la \
 	$(LIBXML2_LIBS) \
+	$(LTLIBINTL) \
 	-lm

 # Make guestfish use the convenience libraries.
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -57,6 +57,7 @@ virt_format_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -71,6 +71,7 @@ guestmount_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # guestunmount
@@ -91,6 +92,7 @@ guestunmount_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Documentation.
@@ -174,6 +176,7 @@ test_guestmount_fd_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 test_guestunmount_fd_SOURCES = \
@@ -191,6 +194,7 @@ test_guestunmount_fd_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 endif HAVE_FUSE
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -84,6 +84,7 @@ virt_inspector_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/make-fs/Makefile.am
+++ b/make-fs/Makefile.am
@@ -50,6 +50,7 @@ virt_make_fs_LDADD = \
 	$(top_builddir)/src/libutils.la \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -99,7 +99,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)

 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) -lncurses -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu

--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -66,10 +66,12 @@ endif
 stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm)
 	$(OCAMLMKLIB) -o mlguestfs \
 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmo \
+	  $(LTLIBINTL) \
 	  -L$(top_builddir)/src/.libs -lguestfs
 if HAVE_OCAMLOPT
 	$(OCAMLMKLIB) -o mlguestfs \
 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmx \
+	  $(LTLIBINTL) \
 	  -L$(top_builddir)/src/.libs -lguestfs
 endif
 	touch $@
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -59,6 +59,7 @@ virt_rescue_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -71,7 +71,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)

 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) -lncurses \
+	$(LIBXML2_LIBS) $(LIBINTL) -lncurses \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,7 +159,7 @@ libguestfs_la_LIBADD = \
 	$(INET_NTOP_LIB) \
 	$(LIBSOCKET) \
 	$(LIB_CLOCK_GETTIME) \
-	$(LIBINTL) \
+	$(LTLIBINTL) \
 	$(LTLIBTHREAD) \
 	$(LTLIBICONV) \
 	$(SERVENT_LIB)
@@ -238,7 +238,8 @@ noinst_PROGRAMS += libvirt-is-version
 libvirt_is_version_SOURCES = libvirt-is-version.c

 libvirt_is_version_LDADD = \
-	$(LIBVIRT_LIBS)
+	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL)

 libvirt_is_version_CPPFLAGS = \
 	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
@@ -266,6 +267,7 @@ test_utils_CFLAGS = \
 test_utils_LDADD = \
 	libguestfs_la-guid.lo \
 	libutils.la \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 check-valgrind:
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -136,7 +136,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)

 OCAMLCLIBS  = \
-	$(LIBXML2_LIBS) -lncurses -lcrypt \
+	$(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \
 	-L../src/.libs -lutils \
 	-L../gnulib/lib/.libs -lgnu

--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -37,6 +37,7 @@ libguestfs_test_tool_CFLAGS = \

 libguestfs_test_tool_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 libguestfs-test-tool.1 $(top_builddir)/html/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod
--- a/tests/c-api/Makefile.am
+++ b/tests/c-api/Makefile.am
@@ -90,6 +90,7 @@ tests_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 # This binary must be statically linked.  It is used for testing
@@ -162,6 +163,7 @@ test_backend_settings_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 test_backend_settings_LDADD = \
 	$(top_builddir)/src/libutils_la-utils.lo \
+	$(LTLIBINTL) \
 	$(top_builddir)/src/libguestfs.la

 test_private_data_SOURCES = test-private-data.c
@@ -203,6 +205,7 @@ test_environment_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 test_environment_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 test_event_string_SOURCES = test-event-string.c
@@ -214,6 +217,7 @@ test_event_string_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 test_event_string_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 #if HAVE_LIBVIRT
--- a/tests/charsets/Makefile.am
+++ b/tests/charsets/Makefile.am
@@ -35,4 +35,5 @@ test_charset_fidelity_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la
--- a/tests/events/Makefile.am
+++ b/tests/events/Makefile.am
@@ -43,5 +43,6 @@ test_libvirt_auth_callbacks_LDADD = \
        $(top_builddir)/src/libguestfs.la \
        $(LIBVIRT_LIBS) \
        $(LIBXML2_LIBS) \
+        $(LTLIBINTL) \
        $(top_builddir)/gnulib/lib/libgnu.la
 endif
--- a/tests/qemu/Makefile.am
+++ b/tests/qemu/Makefile.am
@@ -56,6 +56,7 @@ qemu_boot_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la

 qemu_speed_test_SOURCES = \
@@ -72,4 +73,5 @@ qemu_speed_test_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	$(LTLIBINTL) \
 	$(top_builddir)/gnulib/lib/libgnu.la
--- 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 -lncurses -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ -lgnu'
+exec "$@" -linkpkg -cclib '-lutils -lncurses -lcrypt @LIBVIRT_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu'