From 674581a8d65e0b4e5f4ffaf97bf4cd739e40e738 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 29 Jul 2012 22:52:16 +0900
Subject: [PATCH] Add -lstdc++ -lsupc++ in configure.ac not in android-config

Also make sure that those flags do not appear in libwslay LIBS.
---
 android-config | 1 -
 configure.ac   | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/android-config b/android-config
index c8f38f30..0994b486 100755
--- a/android-config
+++ b/android-config
@@ -52,7 +52,6 @@ PATH=$TOOLCHAIN/bin:$PATH
     --with-libz --with-libz-prefix=$PREFIX \
     CXXFLAGS="-Os -g" \
     CFLAGS="-Os -g" \
-    LIBS="-lstdc++ -lsupc++" \
     LDFLAGS="-L$PREFIX/lib" \
     PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
     ZLIB_LIBS="-lz" \
diff --git a/configure.ac b/configure.ac
index d154001c..a255187d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,6 +612,14 @@ AM_CONDITIONAL([ENABLE_WEBSOCKET], [test "x$enable_websocket" = "xyes"])
 
 AC_SUBST([bashcompletiondir])
 
+case "$host" in
+  *android*)
+    LIBS="$LIBS -lstdc++ -lsupc++"
+    ;;
+  *)
+    ;;
+esac
+
 if test "x$ARIA2_STATIC" = "xyes"; then
   LDFLAGS="$LDFLAGS -all-static -static-libgcc -static-libstdc++"
   dnl For non-MinGW build, we need additional libs for static build.