4.3.4

Author: mistydemeo

ChangeLog

@@ -1,3 +1,13 @@
+2009-12-25  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* Version 4.3.3.
+
+	* configure.ac (AC_INIT): Set version to 4.3.4.
+
+	* m4/gettext.m4 (eb_GNU_GETTEXT): Fix a bug of iconv() and
+	iconv_open() checks. Don't add '-liconv' to LIBS at all times.
+	* m4/gettext.m4 (eb_GNU_GETTEXT): No longer check libiconv_open().
+
 2009-09-29  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
 	* Version 4.3.3.

NEWS

@@ -1,7 +1,13 @@
+$B%P!<%8%g%s(B 4.3.4 $B$K$*$1$k<g$JJQ99E@(B:
+
+* $B4D6-$K$h$C$F$O!"(Bebinfo $B$N=PNO$9$kI{K\$NBjL>$,J8;z2=$1$9$k$N$r=$@5$7$?!#(B
+* $BCm(B: $B%i%$%V%i%jK\BN$K$OJQ99$,$J$$$N$G!"6&M-%i%$%V%i%j$N%P!<%8%g%s$O99?7(B
+  $B$7$F$7$J$$!#(B
+
 $B%P!<%8%g%s(B 4.3.3 $B$K$*$1$k<g$JJQ99E@(B:
 
 * Cygwin, MinGW $B$G(B DLL $B$r:n@.$G$-$k$h$&$K$7$?!#(B
-* Windows $B$G(B ebzipinfo $B$,0[>o=*N;$9$kIT6q9g$r=*N;$7$?!#(B
+* Windows $B$G(B ebzipinfo $B$,0[>o=*N;$9$kIT6q9g$r=$@5$7$?!#(B
 
 $B%P!<%8%g%s(B 4.3.2 $B$K$*$1$k<g$JJQ99E@(B:
 

config.h.in

@@ -51,12 +51,6 @@
 /* Define to 1 if you have the <libcharset.h> header file. */
 #undef HAVE_LIBCHARSET_H
 
-/* Define to 1 if you have the `iconv' library (-liconv). */
-#undef HAVE_LIBICONV
-
-/* Define to 1 if you have the `libiconv_open' function. */
-#undef HAVE_LIBICONV_OPEN
-
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for eb 4.3.3.
+# Generated by GNU Autoconf 2.59 for eb 4.3.4.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -421,8 +421,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='eb'
 PACKAGE_TARNAME='eb'
-PACKAGE_VERSION='4.3.3'
-PACKAGE_STRING='eb 4.3.3'
+PACKAGE_VERSION='4.3.4'
+PACKAGE_STRING='eb 4.3.4'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="eb/eb.c"
@@ -952,7 +952,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures eb 4.3.3 to adapt to many kinds of systems.
+\`configure' configures eb 4.3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1018,7 +1018,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eb 4.3.3:";;
+     short | recursive ) echo "Configuration of eb 4.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1181,7 +1181,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-eb configure 4.3.3
+eb configure 4.3.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1195,7 +1195,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by eb $as_me 4.3.3, which was
+It was created by eb $as_me 4.3.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1840,7 +1840,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eb'
- VERSION='4.3.3'
+ VERSION='4.3.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19579,9 +19579,8 @@ fi;
   save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
   CPPFLAGS="$save_CPPFLAGS $iconv_includes"
-  LIBS="$save_LIBS $iconv_libraries -liconv"
-
-echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+  LIBS="$save_LIBS $iconv_libraries"
+  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
@@ -19646,92 +19645,12 @@ 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
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
-
-  LIBS="-liconv $LIBS"
-
+  ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"
 fi
 
 
-echo "$as_me:$LINENO: 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
-  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 gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char libiconv_open ();
-int
-main ()
-{
-libiconv_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_iconv_libiconv_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_iconv_libiconv_open=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
-if test $ac_cv_lib_iconv_libiconv_open = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
-
-  LIBS="-liconv $LIBS"
-
-fi
-
-
-
-
-for ac_func in iconv_open libiconv_open locale_charset
+for ac_func in iconv_open locale_charset
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -19983,12 +19902,8 @@ fi
 
 done
 
-  if test "$ac_cv_func_iconv_open$ac_cv_func_libiconv_open" != nono; then
+  if test $ac_cv_func_iconv_open != no; then
     ICONVINCS="$iconv_includes"
-    ICONVLIBS="$iconv_libraries -liconv"
-  else
-    iconv_includes=
-    iconv_libraries=
   fi
   CPPFLAGS=$save_CPPFLAGS
   LIBS=$save_LIBS
@@ -22822,7 +22737,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by eb $as_me 4.3.3, which was
+This file was extended by eb $as_me 4.3.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22885,7 +22800,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-eb config.status 4.3.3
+eb config.status 4.3.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,7 +1,7 @@
 dnl *
 dnl * Process this file with autoconf to produce a configure script.
 dnl *
-AC_INIT(eb, 4.3.3)
+AC_INIT(eb, 4.3.4)
 AC_CONFIG_SRCDIR(eb/eb.c)
 AC_PREREQ(2.54)
 AM_INIT_AUTOMAKE

libebutils/puts_eucjp.c

@@ -53,7 +53,7 @@
 int
 fputs_eucjp_to_locale(const char *string, FILE *stream)
 {
-#if defined(HAVE_ICONV_OPEN) || defined(HAVE_LIBICONV_OPEN)
+#if defined(HAVE_ICONV_OPEN)
     size_t string_length;
     const char *locale_encoding;
     char *buffer = NULL;
@@ -133,9 +133,9 @@ fputs_eucjp_to_locale(const char *string, FILE *stream)
 	free(buffer);
     return fputs(string, stream);
 
-#else /* not HAVE_ICONV_OPEN && not HAVE_LIBICONV_OPEN */
+#else /* not HAVE_ICONV_OPEN */
     return fputs(string, stream);
-#endif /* not HAVE_ICONV_OPEN && not HAVE_LIBICONV_OPEN */
+#endif /* not HAVE_ICONV_OPEN */
 }
 
 

m4/gettext.m4

@@ -86,17 +86,13 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl
   save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
   CPPFLAGS="$save_CPPFLAGS $iconv_includes"
-  LIBS="$save_LIBS $iconv_libraries -liconv"
-  AC_CHECK_LIB(iconv, iconv_open)
-  AC_CHECK_LIB(iconv, libiconv_open)
-  AC_CHECK_FUNCS(iconv_open libiconv_open locale_charset)
+  LIBS="$save_LIBS $iconv_libraries"
+  AC_CHECK_LIB(iconv, iconv_open,
+    [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"])
+  AC_CHECK_FUNCS(iconv_open locale_charset)
   AC_CHECK_HEADERS(iconv.h libcharset.h)
-  if test "$ac_cv_func_iconv_open$ac_cv_func_libiconv_open" != nono; then
+  if test $ac_cv_func_iconv_open != no; then
     ICONVINCS="$iconv_includes"
-    ICONVLIBS="$iconv_libraries -liconv"
-  else
-    iconv_includes=
-    iconv_libraries=
   fi
   CPPFLAGS=$save_CPPFLAGS
   LIBS=$save_LIBS