Changeset 14169 for gsdl/trunk/configure

Timestamp:

2007-06-09T14:11:29+12:00 (17 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.

File:

• gsdl/trunk/configure (modified) (4 diffs)

gsdl/trunk/configure

@@ -1426 +1426 @@
 
 
-LDFLAGS=
+LDFLAGS=$LDFLAGS
 if test -z "$CFLAGS"; then
 CFLAGS=-O2
@@ -4664 +4664 @@
 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.  */
@@ -4709 +4709 @@
   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 \
@@ -4720 +4720 @@
 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