From aa26f0bc521608daa2a9ffb5f7551169227ab36a Mon Sep 17 00:00:00 2001
From: KO Myung-Hun <address@hidden>
Date: Sat, 10 Oct 2015 23:23:26 +0900
Subject: [PATCH 2/4] Support building with libtool on OS/2

    modified:   aclocal.m4
    modified:   c++/Makefile.in
---
 aclocal.m4      | 8 ++++++--
 c++/Makefile.in | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index de1f704..e744770 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3219,7 +3219,11 @@ define([CF_LIB_PREFIX],
 [
 	case $cf_cv_system_name in
 	(OS/2*|os2*)
-		LIB_PREFIX=''
+		if test "$DFT_LWR_MODEL" = libtool; then
+			LIB_PREFIX='lib'
+		else
+			LIB_PREFIX=''
+		fi
 		;;
 	(*)	LIB_PREFIX='lib'
 		;;
@@ -7116,7 +7120,7 @@ ifdef([AC_PROG_LIBTOOL],[
 	# special hack to add -no-undefined (which libtool should do for itself)
 	LT_UNDEF=
 	case "$cf_cv_system_name" in
-	(cygwin*|msys*|mingw32*|uwin*|aix[[4-7]])
+	(cygwin*|msys*|mingw32*|os2*|uwin*|aix[[4-7]])
 		LT_UNDEF=-no-undefined
 		;;
 	esac
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 4f5b960..071c17f 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -59,6 +59,9 @@ PACKAGE		= @PACKAGE@
 
 LIBTOOL		= @LIBTOOL_CXX@
 LIBTOOL_OPTS	= @LIBTOOL_OPTS@
+ifeq ($(shell uname -s),OS/2)
+LIBTOOL_OPTS	+= -os2dllname ncurs++
+endif
 LIBTOOL_CLEAN	= @LIB_CLEAN@
 LIBTOOL_COMPILE	= @LIB_COMPILE@
 LIBTOOL_LINK	= @LIB_LINK@
-- 
2.6.0