Re: [Lynx-dev] lynx iconv for Solaris

[Takao Fujiwara - Tokyo S/W Center]

Thomas Dickey-san wrote (12/27/08 01:43 AM):
> aside from occasional testing to check compatibility, I haven't seen
> any real motivation to use the latest autoconf (which has some annoyances
> such as interfering with re-generating "configure" by just running 
> autoconf, increasing the size of the script by a third, and running much 
> more slowly ;-)
>
> > I'll install autoconf 2.52 and reply this later.
>
> It does need the patch of course (for instance, to provide the 
> section-headers in the "configure --help" message).
>
> I configure/install the different versions of autoconf using a suffix to 
> keep them distinct.

I could succeed autoconf with the latest autoheader/autoconf after I modified 
aclocal.m4 and config.hin
I attached the revised patch which is not upstreamed for Solaris.


+# autoconf is failed because of no definition of AC_DIVERT_HELP.
+# lynx maintainer uses the internal patch.
+# ftp://invisible-island.net/autoconf/autoconf-2.57-20030810.patch.gz
+DL='$'
+cat >>aclocal.m4<<_EOF
+m4_define([AC_DIVERT_HELP],
+[m4_divert_once([HELP_WITH], [[${DL}1]])
+])
+_EOF
+
+# lynx_cfg.h is not created correctly because config.hin is generated
+# by the old autoheader/autoconf.
+# Need to remove the comments in #undef lines.
+cp config.hin config.hin.$$
+sed -e "s|^\(#undef .*\)/\*.*\*/|\1|" config.hin.$$ > config.hin
+

--- lynx2-8-6/configure.in.orig 2008-12-22 10:30:12.393958000 +0900
+++ lynx2-8-6/configure.in      2008-12-22 13:30:27.155245000 +0900
@@ -725,7 +725,14 @@ CF_ARG_ENABLE(japanese-utf8,
 AC_MSG_RESULT($use_ja_utf8)
 if test $use_ja_utf8 != no ; then
        AC_DEFINE(EXP_JAPANESEUTF8_SUPPORT)
+       case $host_os in
+       solaris*)
+       AC_CHECK_FUNCS( iconv_open )
+       ;;
+       *)
        AC_CHECK_LIB(iconv,libiconv_open)
+       ;;
+       esac
 fi
 
 AC_MSG_CHECKING(if color-style code should be used)
--- lynx2-8-6/configure.orig    2008-12-29 18:45:54.307797717 +0900
+++ lynx2-8-6/configure 2008-12-29 19:10:48.671794520 +0900
@@ -18558,6 +18558,105 @@ if test $use_ja_utf8 != no ; then
 #define EXP_JAPANESEUTF8_SUPPORT 1
 EOF
 
+       case $host_os in
+       solaris*)
+
+for ac_func in iconv_open
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  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
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+       ;;
+       *)
+ 
 echo "$as_me:18561: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
@@ -18616,6 +18715,8 @@ EOF
 
 fi
 
+       ;;
+       esac
 fi
 
 echo "$as_me:18621: checking if color-style code should be used" >&5