From 62dba758ea64d9819d0021f1d6c9cbb9369d63b1 Mon Sep 17 00:00:00 2001
From: Sean McGovern <gseanmcg@gmail.com>
Date: Wed, 9 Mar 2016 19:41:06 -0500
Subject: configure: use correct ASFLAGS for yasm on Solaris

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 22ad103..0861d2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AS_IF([test x$enable_asm != xno], [
     AS_CASE([$host],
         [*darwin*], [
             ASFLAGS="$ASFLAGS -f macho$BITS -DPREFIX -DHAVE_ALIGNED_STACK=1" ],
-        [*linux*|*dragonfly*|*bsd*], [
+        [*linux*|*dragonfly*|*bsd*|*solaris*], [
             ASFLAGS="$ASFLAGS -f elf -DHAVE_ALIGNED_STACK=1" ],
         [*cygwin*|*mingw*], [
             ASFLAGS="$ASFLAGS -f win$BITS"
-- 
cgit v1.2.3


From 5ab9950816ffcac46afec4ad327640ab28a49109 Mon Sep 17 00:00:00 2001
From: Sean McGovern <gseanmcg@gmail.com>
Date: Wed, 9 Mar 2016 19:48:40 -0500
Subject: configure: add libiconv only when it is both present and required

---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index 0861d2b..0e61cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,10 @@ AM_CONDITIONAL([ENABLE_PROFILE], [test x$enable_profile = xyes])
 # add packages to pkg-config for static linking
 if test "$use_libiconv" = true; then
     AC_DEFINE(CONFIG_ICONV, 1, [use iconv])
+    if test x$ac_cv_search_libiconv_open != x'none required' &&
+       test x$ac_cv_search_iconv_open != x'none required'; then
+        pkg_libs="${pkg_libs} -liconv"
+    fi
 fi
 pkg_requires="freetype2 >= 9.10.3"
 pkg_requires="fribidi >= 0.19.0, ${pkg_requires}"
-- 
cgit v1.2.3