From 23e350ecb51b2b3828f199881dcc3cd680d45ca7 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Sun, 28 Apr 2013 20:40:36 +0900 Subject: [PATCH 6/6] configury: specify a OS/2 DLL name for m4/m4 to libm4 Without this, m4/m4.dll and modules/m4.dll could not be distinguished. * Makefile.am (m4_libm4_la): Specify its dll name to libm4 on OS/2. * configure.ac (HAVE_OS2): Define it on OS/2. --- Makefile.am | 3 +++ configure.ac | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index c752ff2..c1cf393 100644 --- a/Makefile.am +++ b/Makefile.am @@ -231,6 +231,9 @@ m4_libm4_la_SOURCES = \ m4/symtab.c \ m4/syntax.c \ m4/utility.c +if HAVE_OS2 +m4_libm4_la_LDFLAGS = $(AM_LDFLAGS) -os2dllname libm4 +endif m4_libm4_la_LIBADD = m4/gnu/libgnu.la \ $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL) m4_libm4_la_DEPENDENCIES = $(LTDLDEPS) m4/gnu/libgnu.la diff --git a/configure.ac b/configure.ac index 81894c3..4b9c65b 100644 --- a/configure.ac +++ b/configure.ac @@ -276,6 +276,7 @@ M4_SYSCMD AS_CASE([$host], [*-*-os2*], [LDFLAGS="$LDFLAGS -Zargs-resp -no-undefined"]) +AM_CONDITIONAL([HAVE_OS2], [test "${host_os#os2}" != "$host_os"]) ## -------- ## -- 1.7.3.2