From 1c9a173b3dbb2f89658ad26cc6ede6fe9afed706 Mon Sep 17 00:00:00 2001 From: axel Date: Thu, 20 Jul 2006 23:01:48 +1000 Subject: [PATCH] Make sure autoconf tells the Makefile whether gettext is installed darcs-hash:20060720130148-ac50b-9aef2d0e708a1253187a215d0407764510ba0ff0.gz --- Makefile.in | 2 +- configure.ac | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 275575ed1..3df5e56e9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,7 +186,7 @@ TRANSLATIONS_SRC := $(wildcard po/*.po) TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) #Make everything needed for installing fish -all: $(PROGRAMS) user_doc etc/fish share/fish +all: $(PROGRAMS) user_doc etc/fish share/fish $(TRANSLATIONS) @echo fish has now been built. @echo Use \'make install\' to install fish. .PHONY: all diff --git a/configure.ac b/configure.ac index 86f86beb1..7123ea246 100644 --- a/configure.ac +++ b/configure.ac @@ -257,10 +257,13 @@ AC_CHECK_HEADER([regex.h], [AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])]) # Check for presense of various functions -AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext fwprintf ) +AC_CHECK_FUNCS( gettext wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf ) AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc ) AC_CHECK_FUNCS( wcstol dcgettext wcslcat wcslcpy lrand48_r) +# The Makefile also needs to know if we have gettext, so it knows if the translations should be installed. +AC_CHECK_FUNC( gettext, AC_SUBST( HAVE_GETTEXT, 1 ), AC_SUBST( HAVE_GETTEXT, 0 ) ) + # Here follows a list of small programs used to test for various # features that Autoconf doesn't tell us about