Changeset 14170

Show
Ignore:
Timestamp:
09.06.2007 14:20:30 (12 years ago)
Author:
mdewsnip
Message:

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

Location:
indexers/trunk/mgpp
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • indexers/trunk/mgpp/configure

    r13698 r14170  
    45594559if test $ENABLE_ACCENTFOLD = 1; then 
    45604560 
    4561 echo "$as_me:$LINENO: checking for main in -lICONV" >&5 
    4562 echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6 
    4563 if test "${ac_cv_lib_ICONV_main+set}" = set; then 
     4561echo "$as_me:$LINENO: checking for main in -liconv" >&5 
     4562echo $ECHO_N "checking for main in -liconv... $ECHO_C" >&6 
     4563if test "${ac_cv_lib_iconv_main+set}" = set; then 
    45644564  echo $ECHO_N "(cached) $ECHO_C" >&6 
    45654565else 
    45664566  ac_check_lib_save_LIBS=$LIBS 
    4567 LIBS="-lICONV  $LIBS" 
     4567LIBS="-liconv  $LIBS" 
    45684568cat >conftest.$ac_ext <<_ACEOF 
    45694569/* confdefs.h.  */ 
     
    46044604  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    46054605  (exit $ac_status); }; }; then 
    4606   ac_cv_lib_ICONV_main=yes 
     4606  ac_cv_lib_iconv_main=yes 
    46074607else 
    46084608  echo "$as_me: failed program was:" >&5 
    46094609sed 's/^/| /' conftest.$ac_ext >&5 
    46104610 
    4611 ac_cv_lib_ICONV_main=no 
     4611ac_cv_lib_iconv_main=no 
    46124612fi 
    46134613rm -f conftest.err conftest.$ac_objext \ 
     
    46154615LIBS=$ac_check_lib_save_LIBS 
    46164616fi 
    4617 echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5 
    4618 echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6 
    4619 if test $ac_cv_lib_ICONV_main = yes; then 
     4617echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_main" >&5 
     4618echo "${ECHO_T}$ac_cv_lib_iconv_main" >&6 
     4619if test $ac_cv_lib_iconv_main = yes; then 
    46204620  cat >>confdefs.h <<_ACEOF 
    46214621#define HAVE_LIBICONV 1 
    46224622_ACEOF 
    46234623 
    4624   LIBS="-lICONV $LIBS" 
    4625  
    4626 fi 
    4627 ac_cv_lib_ICONV=ac_cv_lib_ICONV_main 
     4624  LIBS="-liconv $LIBS" 
     4625 
     4626fi 
     4627ac_cv_lib_iconv=ac_cv_lib_iconv_main 
    46284628 
    46294629fi 
  • indexers/trunk/mgpp/configure.in

    r13698 r14170  
    7777AC_CHECK_LIB(crypt, main) 
    7878if test $ENABLE_ACCENTFOLD = 1; then 
    79 AC_HAVE_LIBRARY(ICONV) 
     79AC_HAVE_LIBRARY(iconv) 
    8080fi 
    8181