OS/2 does not support a DLL name longer than 8 characters. * gettext-tools/configure.ac (OS2): Define on OS/2. * gettext-tools/gnulib-lib/Makefile.am (libgettextlib_la_LDFLAGS): Set a DLL name to gtlib on OS/2. * gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_LDFLAGS): Set a DLL name to gtpo on OS/2. * gettext-tools/src/Makefile.am (libgettextsrc_la_LDFLAGS): Set a DLL name to gtsrc on OS/2. --- gettext-tools/configure.ac | 2 ++ gettext-tools/gnulib-lib/Makefile.am | 5 +++++ gettext-tools/libgettextpo/Makefile.am | 5 +++++ gettext-tools/src/Makefile.am | 5 +++++ 4 files changed, 17 insertions(+)
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index d5e612a..ef151f8 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -105,6 +105,8 @@ case "$host_os" in esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) +AM_CONDITIONAL([OS2], [test "${host_os#os2}" != "${host_os}"]) + dnl On Cygwin 1.7.10-1 or later, error_* variables are defined in the dnl Cygwin DLL. To avoid any conflict with gettext DLLs, always link dnl to gnulib's error.c. See GETTEXTLIB_EXPORTS_FLAGS setting below. diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am index 9e43721..c930367 100644 --- a/gettext-tools/gnulib-lib/Makefile.am +++ b/gettext-tools/gnulib-lib/Makefile.am @@ -61,6 +61,11 @@ include Makefile.gnulib # Which classes to export from the shared library. MOOPPFLAGS += --dllexport=styled_ostream +# OS/2 does not support a DLL name longer than 8 characters. +if OS2 +libgettextlib_la_LDFLAGS += -os2dllname gtlib +endif + # Linking with C++ libraries is needed _only_ on mingw and Cygwin. if !WOE32DLL libgettextlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index dfbf40c..c82a632 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -118,6 +118,11 @@ libgettextpo_la_SOURCES += ../woe32dll/gettextpo-exports.c libgettextpo_la_LDFLAGS += -Wl,--export-all-symbols endif +# OS/2 does not support a DLL name longer than 8 characters. +if OS2 +libgettextpo_la_LDFLAGS += -os2dllname gtpo +endif + # Version information according to Woe32 conventions. EXTRA_DIST += libgettextpo.rc if WOE32 diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 7109072..f31d434 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -256,6 +256,11 @@ libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined +# OS/2 does not support a DLL name longer than 8 characters. +if OS2 +libgettextsrc_la_LDFLAGS += -os2dllname gtsrc +endif + libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(INCXML) # Tell the mingw or Cygwin linker which symbols to export. -- 2.6.0