[mapserver-commits] r7692 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Wed Jun 18 14:24:27 EDT 2008
Author: dmorissette
Date: 2008-06-18 14:24:26 -0400 (Wed, 18 Jun 2008)
New Revision: 7692
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/configure
trunk/mapserver/configure.in
Log:
Fixed libiconv detection in configure for OSX 10.5 64 bit (#2396)
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2008-06-18 18:07:15 UTC (rev 7691)
+++ trunk/mapserver/HISTORY.TXT 2008-06-18 18:24:26 UTC (rev 7692)
@@ -13,11 +13,15 @@
Current Version (SVN trunk):
----------------------------
+- Fixed libiconv detection in configure for OSX 10.5 64 bit (#2396)
+
- mapstring.c: possible buffer overflow in msGetPath (#2649)
-- maputil.c: Correct expression evaluation with text containing apostrophes (#2641)
+- maputil.c: Correct expression evaluation with text containing
+ apostrophes (#2641)
-- mapwfs.c: Genrate possibly an error message when applying filter encoding (#2444)
+- mapwfs.c: Possibly generate an error message when applying filter
+ encoding (#2444)
- Added MS_LABEL_BINDING constants for SWIG MapScript (#2643)
Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure 2008-06-18 18:07:15 UTC (rev 7691)
+++ trunk/mapserver/configure 2008-06-18 18:24:26 UTC (rev 7692)
@@ -5886,6 +5886,7 @@
unset ac_cv_lib_iconv_libiconv_open
+unset ac_cv_lib_iconv_iconv_open
unset ac_cv_lib_c_iconv_open
@@ -6046,9 +6047,74 @@
ICONV_LIB="-L$ICONV_LIBDIR -liconv"
fi
+ { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-liconv "-L$ICONV_LIBDIR" $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char iconv_open ();
+int
+main ()
+{
+return iconv_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_iconv_iconv_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_iconv_iconv_open=no
fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
+if test $ac_cv_lib_iconv_iconv_open = yes; then
+ ICONV_LIB="-L$ICONV_LIBDIR -liconv"
+fi
+
+
+fi
+
if test -n "$ICONV_LIB" ; then
if test -n "$ICONV_INCDIR"; then
ICONV_INC="-I$ICONV_INCDIR"
@@ -6213,7 +6279,72 @@
ICONV_LIB="-liconv"
fi
+ { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-liconv $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char iconv_open ();
+int
+main ()
+{
+return iconv_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_iconv_iconv_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_iconv_iconv_open=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
+if test $ac_cv_lib_iconv_iconv_open = yes; then
+ ICONV_LIB="-liconv"
+fi
+
+
if test -n "$ICONV_LIB" ; then
{ echo "$as_me:$LINENO: result: using libiconv from system libs." >&5
echo "${ECHO_T} using libiconv from system libs." >&6; }
Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in 2008-06-18 18:07:15 UTC (rev 7691)
+++ trunk/mapserver/configure.in 2008-06-18 18:24:26 UTC (rev 7692)
@@ -384,6 +384,7 @@
dnl ---------------------------------------------------------------------
unset ac_cv_lib_iconv_libiconv_open
+unset ac_cv_lib_iconv_iconv_open
unset ac_cv_lib_c_iconv_open
AC_ARG_WITH(libiconv,
@@ -410,6 +411,7 @@
dnl Just doing the AC_CHECK_LIB(iconv ...) last does the trick.
AC_CHECK_LIB(c, iconv_open, ICONV_LIB="-L$ICONV_LIBDIR -lc",,"-L$ICONV_LIBDIR")
AC_CHECK_LIB(iconv, libiconv_open, ICONV_LIB="-L$ICONV_LIBDIR -liconv",,"-L$ICONV_LIBDIR")
+ AC_CHECK_LIB(iconv, iconv_open, ICONV_LIB="-L$ICONV_LIBDIR -liconv",,"-L$ICONV_LIBDIR")
fi
@@ -428,6 +430,7 @@
unset ac_cv_lib_c_iconv_open
AC_CHECK_LIB(c, iconv_open, ICONV_LIB="-lc",,)
AC_CHECK_LIB(iconv, libiconv_open, ICONV_LIB="-liconv",,)
+ AC_CHECK_LIB(iconv, iconv_open, ICONV_LIB="-liconv",,)
if test -n "$ICONV_LIB" ; then
AC_MSG_RESULT([ using libiconv from system libs.])
More information about the mapserver-commits
mailing list