Optionally add intl library, needed by gettext on NetBSD. Also clean up configure.ac a bit.

darcs-hash:20060118124113-ac50b-ef767f474de5bc27edc986be7526bdeb814f855a.gz

1 files changed, 19 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index b40d1f0c..5b720b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,18 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(fish,1.20.0,fish-users@lists.sf.net)
 
-# Run autoheader automatically, it's quick, and saves people the hassle of remembering to run it manually
-autoheader
+# If needed, run autoheader automatically
+if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
+	if which autoheader >/dev/null; then
+		echo running autoheader...
+		autoheader
+	else
+		echo Could not find the autoheader program in your path.
+		echo This program is needed because the configure.ac file has been modified.
+		echo Please install it and try again.
+		exit 1
+	fi
+fi
 
 # Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
@@ -12,7 +22,7 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-# Check for doxygen, needed to build
+# Check for doxygen, which is needed to build
 AC_CHECK_PROG( has_doxygen, [doxygen], "true")
 
 if ! test $has_doxygen = "true"; then
@@ -49,7 +59,7 @@ fi
 AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
 
 
-# Set up install locations
+# Set up installation directories
 if [[ "$prefix" = NONE ]]; then
 	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
 	AC_SUBST( PREFIX, /usr/local)
@@ -136,14 +146,15 @@ fi
 # Check for libraries
 AC_CHECK_LIB(socket, connect)
 AC_CHECK_LIB(rt, nanosleep)
+AC_CHECK_LIB(intl, gettext)
 
 # Check for various header files
 AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
 
-# Check for various function
+# Check for various functions, and insert results into config.h
 AC_CHECK_FUNCS(wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext wprintf futimes wcwidth wcswidth getopt_long ) 
 
-# Check again for gettext library, so we can insert information 
+# Check again for gettext library, and insert results into the Makefile
 AC_CHECK_FUNC(gettext, AC_SUBST(HAVE_GETTEXT,1), AC_SUBST(HAVE_GETTEXT,0) )
 
 # Check if we have ncurses, and use it rather than curses if possible.
@@ -157,4 +168,5 @@ AC_CHECK_FILE([/usr/pkg/include/ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEF
 AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish init/fish_interactive.fish init/fish_complete.fish])
 AC_OUTPUT
 
-echo "Now run 'make' and 'make install'"
+echo "Now run 'make' and 'make install' to built and install fish."
+echo "Good luck!"