Complete.Org: Mailing Lists: Archives: freeciv-dev: November 2004:
[Freeciv-Dev] (PR#10979) make iconv manditory
Home

[Freeciv-Dev] (PR#10979) make iconv manditory

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#10979) make iconv manditory
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 11 Nov 2004 09:59:38 -0800
Reply-to: rt@xxxxxxxxxxx

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10979 >

This patch makes iconv manditory.

It is made for the S2_0 branch, but should be applied to the dev branch 
as well.

jason

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.80.2.3
diff -u -r1.80.2.3 configure.ac
--- configure.ac        20 Oct 2004 03:45:21 -0000      1.80.2.3
+++ configure.ac        11 Nov 2004 17:55:57 -0000
@@ -334,6 +334,9 @@
 AM_ICONV
 AM_LIBCHARSET
 AM_LANGINFO_CODESET
+if test "$am_cv_func_iconv" != yes; then
+  AC_MSG_ERROR([Iconv is missing.  You can get it from http://gnu.org/.])
+fi
 LIBS="$LIBS $LIBICONV"
 
 dnl Check and choose clients
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Attic/configure.in,v
retrieving revision 1.256.2.3
diff -u -r1.256.2.3 configure.in
--- configure.in        20 Oct 2004 03:45:21 -0000      1.256.2.3
+++ configure.in        11 Nov 2004 17:55:57 -0000
@@ -325,6 +325,9 @@
 AM_ICONV
 AM_LIBCHARSET
 AM_LANGINFO_CODESET
+if test "$am_cv_func_iconv" != yes; then
+  AC_MSG_ERROR([Iconv is missing.  You can get it from http://gnu.org/.])
+fi
 LIBS="$LIBS $LIBICONV"
 
 dnl Check and choose clients

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#10979) make iconv manditory, Jason Short <=