From 89c1770e14c8ca3fa478ddf3106f76835fc0704f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Wed, 9 Mar 2016 14:11:40 -0800
Subject: [PATCH] autoconf improvements: @SET_MAKE@, library extension

Minor autoconf corner cases.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 Makefile.in       |  4 +++-
 aclocal.m4        | 20 ++++++++++++++++++++
 configure.in      |  3 +++
 rdoff/Makefile.in |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6ce5c7ccb..06face8e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,8 @@
 # redistributable under the license given in the file "LICENSE"
 # distributed in the NASM archive.
 
+@SET_MAKE@
+
 top_srcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -48,7 +50,7 @@ FIND		= find
 # Binary suffixes
 O               = @OBJEXT@
 X               = @EXEEXT@
-A		= a
+A		= @LIBEXT@
 
 # Debug stuff
 ifeq ($(TRACE),1)
diff --git a/aclocal.m4 b/aclocal.m4
index 43fa36d4c..de80e1431 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -27,3 +27,23 @@ AC_MSG_RESULT([yes])
 AC_DEFINE(m4_toupper([HAVE_$1]), [1],
   [Define to 1 if you have the `$1' intrinsic function.]),
 AC_MSG_RESULT([no]))])
+
+dnl --------------------------------------------------------------------------
+dnl PA_LIBEXT
+dnl
+dnl Guess the library extension based on the object extension
+dnl --------------------------------------------------------------------------
+AC_DEFUN(PA_LIBEXT,
+[AC_MSG_CHECKING([for suffix of library files])
+if test x"$LIBEXT" = x; then
+  case "$OBJEXT" in
+    obj )
+      LIBEXT=lib
+      ;;
+    *)
+      LIBEXT=a
+      ;;
+  esac
+fi
+AC_MSG_RESULT([$LIBEXT])
+AC_SUBST([LIBEXT])])
diff --git a/configure.in b/configure.in
index df949f52c..8deb49ff5 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,9 @@ else
 fi
 AC_PROG_INSTALL
 
+dnl Check for library extension
+PA_LIBEXT
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in
index b223a65d5..a461c24c0 100644
--- a/rdoff/Makefile.in
+++ b/rdoff/Makefile.in
@@ -45,7 +45,7 @@ LIBS		= $(RDFLIB) $(NASMLIB)
 # Binary suffixes
 O               = @OBJEXT@
 X               = @EXEEXT@
-A		= a
+A		= @LIBEXT@
 
 PROGRAMS = rdfdump$(X) ldrdf$(X) rdx$(X) rdflib$(X) \
 	   rdf2bin$(X) rdf2com$(X) rdf2ith$(X) rdf2ihx$(X) rdf2srec$(X)