Changeset 14170

Timestamp:

2007-06-09T14:20:30+12:00 (17 years ago)

Author:

mdewsnip

Message:

Changed ICONV to iconv so this works on Solaris and other non-Linux machines.

Location:

indexers/trunk/mgpp

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (1 diff)

indexers/trunk/mgpp/configure

@@ -4559 +4559 @@
 if test $ENABLE_ACCENTFOLD = 1; then
 
-echo "$as_me:$LINENO: checking for main in -lICONV" >&5
-echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6
-if test "${ac_cv_lib_ICONV_main+set}" = set; then
+echo "$as_me:$LINENO: checking for main in -liconv" >&5
+echo $ECHO_N "checking for main in -liconv... $ECHO_C" >&6
+if test "${ac_cv_lib_iconv_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICONV  $LIBS"
+LIBS="-liconv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4604 +4604 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_ICONV_main=yes
+  ac_cv_lib_iconv_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ICONV_main=no
+ac_cv_lib_iconv_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -4615 +4615 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5
-echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6
-if test $ac_cv_lib_ICONV_main = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_main" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_main" >&6
+if test $ac_cv_lib_iconv_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICONV 1
 _ACEOF
 
-  LIBS="-lICONV $LIBS"
-
-fi
-ac_cv_lib_ICONV=ac_cv_lib_ICONV_main
+  LIBS="-liconv $LIBS"
+
+fi
+ac_cv_lib_iconv=ac_cv_lib_iconv_main
 
 fi

indexers/trunk/mgpp/configure.in

@@ -77 +77 @@
 AC_CHECK_LIB(crypt, main)
 if test $ENABLE_ACCENTFOLD = 1; then
-AC_HAVE_LIBRARY(ICONV)
+AC_HAVE_LIBRARY(iconv)
 fi