Determine whether compiling Cygwin DLLs.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 4d8fd6c719286a505faa9698b65bea42bb0441a5..a374de098c348352684907d48704e2925f1f459e 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-11  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.m4 (AM_INTL_SUBDIR): Set variable CYGWINDLL.
+
 2006-05-07  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (gt_INTL_SUBDIR_CORE): Fix test of __builtin_expect so

diff --git a/gettext-runtime/m4/Makefile.in b/gettext-runtime/m4/Makefile.in
index ff36cd2fb968638d5b2d54992aad4a4dc3ca5b47..85d29e9f4a6e2bdb64c43e095c60abc99d4f5d58 100644 (file)
--- a/gettext-runtime/m4/Makefile.in
+++ b/gettext-runtime/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \
        $(top_srcdir)/../m4/libtool.m4 \
+       $(top_srcdir)/../m4/woe32-dll.m4 \
        $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
        $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
        $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
@@ -112,9 +113,11 @@ CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CLASSPATH = @CLASSPATH@
 CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
+CONF_JAVAC = @CONF_JAVAC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CROSS_COMPILING = @CROSS_COMPILING@
+CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -130,8 +133,6 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@
-ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@
 ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@
 ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@
 EXEEXT = @EXEEXT@
@@ -142,6 +143,7 @@ GETOPT_H = @GETOPT_H@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
@@ -150,6 +152,7 @@ HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
 HAVE_GCJ_C = @HAVE_GCJ_C@
 HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
 HAVE_JAVAC = @HAVE_JAVAC@
+HAVE_JAVAC_ENVVAR = @HAVE_JAVAC_ENVVAR@
 HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
 HAVE_JIKES = @HAVE_JIKES@
 HAVE_JIKES_IN_PATH = @HAVE_JIKES_IN_PATH@
@@ -171,7 +174,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
-JAVAC = @JAVAC@
 JAVA_CHOICE = @JAVA_CHOICE@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -191,8 +193,8 @@ LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -218,6 +220,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_AS = @ac_ct_AS@
@@ -256,6 +259,7 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index e26ce00a718105175f47f413321a348e519f03cb..3d8800a8c8619d67c96d1b5c66065b34a0d59070 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 47 (gettext-0.15)
+# gettext.m4 serial 48 (gettext-0.15)
 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -419,6 +419,24 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AM_LANGINFO_CODESET
   gt_LC_MESSAGES
 
+  dnl Compilation on Cygwin needs special Makefile rules, because
+  dnl 1. when we install a shared library, we must arrange to export
+  dnl    auxiliary pointer variables for every exported variable,
+  dnl 2. when we install a shared library and a static library simultaneously,
+  dnl    the include file specifies __declspec(dllimport) and therefore we
+  dnl    must arrange to define the auxiliary pointer variables for the
+  dnl    exported variables _also_ in the static library.
+  if test "$enable_shared" = yes; then
+    case "$host_os" in
+      cygwin*) is_cygwindll=yes ;;
+      *) is_cygwindll=no ;;
+    esac
+  else
+    is_cygwindll=no
+  fi
+  CYGWINDLL=$is_cygwindll
+  AC_SUBST([CYGWINDLL])
+
   dnl Rename some macros and functions used for locking.
   AH_BOTTOM([
 #define __libc_lock_t                   gl_lock_t