Changeset 14169

Show
Ignore:
Timestamp:
09.06.2007 14:11:29 (12 years ago)
Author:
mdewsnip
Message:

Changed ICONV to iconv so this works on Solaris and other non-Linux machines, and fixed LDFLAGS so you can set it as an option to ./configure.

Location:
gsdl/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/configure

    r13777 r14169  
    14261426 
    14271427 
    1428 LDFLAGS= 
     1428LDFLAGS=$LDFLAGS 
    14291429if test -z "$CFLAGS"; then 
    14301430CFLAGS=-O2 
     
    46644664if test $ENABLE_ACCENTFOLD = 1; then 
    46654665 
    4666 echo "$as_me:$LINENO: checking for main in -lICONV" >&5 
    4667 echo $ECHO_N "checking for main in -lICONV... $ECHO_C" >&6 
    4668 if test "${ac_cv_lib_ICONV_main+set}" = set; then 
     4666echo "$as_me:$LINENO: checking for main in -liconv" >&5 
     4667echo $ECHO_N "checking for main in -liconv... $ECHO_C" >&6 
     4668if test "${ac_cv_lib_iconv_main+set}" = set; then 
    46694669  echo $ECHO_N "(cached) $ECHO_C" >&6 
    46704670else 
    46714671  ac_check_lib_save_LIBS=$LIBS 
    4672 LIBS="-lICONV  $LIBS" 
     4672LIBS="-liconv  $LIBS" 
    46734673cat >conftest.$ac_ext <<_ACEOF 
    46744674/* confdefs.h.  */ 
     
    47094709  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    47104710  (exit $ac_status); }; }; then 
    4711   ac_cv_lib_ICONV_main=yes 
     4711  ac_cv_lib_iconv_main=yes 
    47124712else 
    47134713  echo "$as_me: failed program was:" >&5 
    47144714sed 's/^/| /' conftest.$ac_ext >&5 
    47154715 
    4716 ac_cv_lib_ICONV_main=no 
     4716ac_cv_lib_iconv_main=no 
    47174717fi 
    47184718rm -f conftest.err conftest.$ac_objext \ 
     
    47204720LIBS=$ac_check_lib_save_LIBS 
    47214721fi 
    4722 echo "$as_me:$LINENO: result: $ac_cv_lib_ICONV_main" >&5 
    4723 echo "${ECHO_T}$ac_cv_lib_ICONV_main" >&6 
    4724 if test $ac_cv_lib_ICONV_main = yes; then 
     4722echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_main" >&5 
     4723echo "${ECHO_T}$ac_cv_lib_iconv_main" >&6 
     4724if test $ac_cv_lib_iconv_main = yes; then 
    47254725  cat >>confdefs.h <<_ACEOF 
    47264726#define HAVE_LIBICONV 1 
    47274727_ACEOF 
    47284728 
    4729   LIBS="-lICONV $LIBS" 
    4730  
    4731 fi 
    4732 ac_cv_lib_ICONV=ac_cv_lib_ICONV_main 
     4729  LIBS="-liconv $LIBS" 
     4730 
     4731fi 
     4732ac_cv_lib_iconv=ac_cv_lib_iconv_main 
    47334733 
    47344734fi 
  • gsdl/trunk/configure.in

    r13777 r14169  
    7272 
    7373dnl Checks for programs. 
    74 LDFLAGS= 
     74LDFLAGS=$LDFLAGS 
    7575dnl only set CFLAGS if not already set in environment 
    7676if test -z "$CFLAGS"; then 
     
    156156AC_HAVE_LIBRARY(crypt) 
    157157if test $ENABLE_ACCENTFOLD = 1; then 
    158 AC_HAVE_LIBRARY(ICONV) 
     158AC_HAVE_LIBRARY(iconv) 
    159159fi 
    160160