Fix gnulib config.cache values

2 files changed, 65 insertions, 6 deletions

diff --git a/cygwin-gettext.spec b/cygwin-gettext.spec
index d183c56..3a97acf 100644
--- a/cygwin-gettext.spec
+++ b/cygwin-gettext.spec
@@ -7,7 +7,7 @@
 
 Name:      cygwin-gettext
 Version:   0.18.1.1
-Release:   1
+Release:   2
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -20,6 +20,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
 Patch0:    gettext-0.18.1.1-autopoint-V.patch
 Patch1:    gettext-0.18.1.1-locale.patch
 Patch2:    gettext-0.18.1.1-reloc.patch
+Patch3:    gettext-0.18.1.1-cygwin-error_h.patch
 
 BuildRequires: cygwin-filesystem
 BuildRequires: cygwin
@@ -56,6 +57,7 @@ Static version of the Cygwin Gettext library.
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2
 
 rm -f m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
 touch m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
@@ -79,24 +81,43 @@ libtoolize --copy --force
   --with-included-libcroco \
   --with-included-libunistring \
   --with-included-libxml \
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes \
+  am_cv_func_iconv_works=yes \
   gl_cv_cc_visibility=no \
-  gl_cv_func_btowc_eof=yes gl_cv_func_btowc_nul=yes \
+  gl_cv_header_working_fcntl_h=yes \
+  gl_cv_func_btowc_eof=yes \
+  gl_cv_func_btowc_nul=yes \
   gl_cv_func_dup2_works=yes \
   gl_cv_func_fcntl_f_dupfd_works=yes \
+  gl_cv_func_fnmatch_posix=yes \
+  gl_cv_func_fopen_slash=yes \
   gl_cv_func_working_getdelim=yes \
+  gl_cv_func_getopt_posix=yes \
   gl_cv_func_gettimeofday_clobber=no \
-  ac_cv_func_lstat_dereferences_slashed_symlink=yes \
+  gl_cv_func_mbrtowc_incomplete_state=yes \
+  gl_cv_func_mbrtowc_null_arg=yes \
+  gl_cv_func_mbrtowc_retval=yes \
+  gl_cv_func_mbsrtowcs_works=yes \
   gl_cv_func_memchr_works=yes \
-  gl_cv_func_svid_putenv=yes \
+  gl_cv_func_open_slash=yes \
   gl_cv_func_readlink_works=yes \
   gl_cv_func_rmdir_works=yes \
-  gl_cv_func_setenv_works=yes gl_cv_func_unsetenv_works=yes \
+  gt_cv_func_printf_posix=yes \
+  gl_cv_func_setenv_works=yes \
+  gl_cv_func_snprintf_retval_c99=yes \
+  gl_cv_func_snprintf_size1=yes \
+  gl_cv_func_stat_dir_slash=yes \
   gl_cv_func_stat_file_slash=yes \
   gl_cv_func_stpncpy=yes \
   gl_cv_func_strstr_linear=yes \
+  gl_cv_func_svid_putenv=yes \
   gl_cv_func_symlink_works=yes \
+  gl_cv_func_unsetenv_works=yes \
+  gl_cv_func_wcrtomb_retval=yes \
   gl_cv_func_wctob_works=yes \
-  gl_cv_func_wcwidth_works=yes
+  gl_cv_func_wcwidth_works=yes \
+  gl_cv_have_weak=no \
+  gt_cv_int_divbyzero_sigfpe=yes
 
 make %{?_smp_mflags}
 
@@ -158,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 24 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.18.1.1-2
+- Remove bogus printf symbols from libintl.
+- Set correct config.cache values for more AC_TRY_RUNs.
+
 * Mon Oct 31 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.18.1.1-1
 - Version bump.
 - Included relocation and locale patches from Cygwin gettext 0.18.1.1-2.
diff --git a/gettext-0.18.1.1-cygwin-error_h.patch b/gettext-0.18.1.1-cygwin-error_h.patch
new file mode 100644
index 0000000..5fef32b
--- /dev/null
+++ b/gettext-0.18.1.1-cygwin-error_h.patch
@@ -0,0 +1,34 @@
+Cygwin has exported error.h since 1.7.10.
+
+--- origsrc/gettext-0.18.1.1/gettext-tools/libgettextpo/error.h	2010-02-16 15:33:13.000000000 -0600
++++ src/gettext-0.18.1.1/gettext-tools/libgettextpo/error.h	2013-01-24 22:19:12.749318500 -0600
+@@ -49,14 +49,14 @@ extern void error_at_line (int __status,
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++extern __declspec(dllimport) void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time `error' is called.  */
+-extern DLL_VARIABLE unsigned int error_message_count;
++extern __declspec(dllimport) unsigned int error_message_count;
+ 
+ /* Sometimes we want to have at most one error per line.  This
+    variable controls whether this mode is selected or not.  */
+-extern DLL_VARIABLE int error_one_per_line;
++extern __declspec(dllimport) int error_one_per_line;
+ 
+ #ifdef __cplusplus
+ }
+--- origsrc/gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c	2010-06-06 07:49:58.000000000 -0500
++++ src/gettext-0.18.1.1/gettext-tools/woe32dll/gettextlib-exports.c	2013-01-24 21:17:39.584846100 -0600
+@@ -18,9 +18,6 @@
+ #include "woe32dll/export.h"
+ 
+ VARIABLE(argmatch_die)
+-VARIABLE(error_message_count)
+-VARIABLE(error_one_per_line)
+-VARIABLE(error_print_progname)
+ VARIABLE(error_with_progname)
+ VARIABLE(exit_failure)
+ VARIABLE(gl_array_list_implementation)