Merge branch 'master' of https://github.com/DoubangoTelecom/doubango

android_build.sh

@@ -111,7 +111,7 @@ do
 	
 	echo -e building for ARCH="$arch, OPTIONS=$OPTIONS.... \n"
 	
-	./configure --host=$HOST --with-android-cpu=$arch --prefix=$HOME/$arch --with-pic --enable-nonfree=$ENABLE_NONFREE --enable-gpl=$ENABLE_GPL --enable-debug=$DEBUG $OPTIONS
+	./configure --host=$HOST --with-android-cpu=$arch --prefix=$HOME/$arch --without-pic --enable-nonfree=$ENABLE_NONFREE --enable-gpl=$ENABLE_GPL --enable-debug=$DEBUG $OPTIONS
 	make clean
 	make uninstall
 	make all

configure.ac

@@ -79,7 +79,7 @@ if test "$target_os" = "android"; then
 
 	AC_SUBST(NDK, $NDK)
 	
-	export CFLAGS="${CFLAGS} -DANDROID=1 -fPIC"
+	export CFLAGS="${CFLAGS} -DANDROID=1"
 	export CPPFLAGS=$CFLAGS
 	export LDFLAGS="${LDFLAGS} -lc -lm -lgcc"