From 048b27f0812f44f88ed9315bd865ae482b3163a7 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Fri, 9 Mar 2012 02:22:21 +0100
Subject: [PATCH] * Update to acr 0.8.9

---
 configure             |  4 ++--
 r2-bindings/configure | 32 ++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index abb3962736..4ec4a764c9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was automatically generated by ACR v0.8.8
+# This script was automatically generated by ACR v@VERSION@
 # @author: pancake <youterm.com>
 # @url:    http://www.nopcode.org
 # @repo:   hg clone http://hg.youterm.com/acr
@@ -187,7 +187,7 @@ take_environ() {
 }
 
 show_version() {
-echo "radare2-0.9.1hg configuration script done with acr v0.8.8.
+echo "radare2-0.9.1hg configuration script done with acr v@VERSION@.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <youterm.com>."
 exit 0
diff --git a/r2-bindings/configure b/r2-bindings/configure
index 34595856fb..df21da459f 100755
--- a/r2-bindings/configure
+++ b/r2-bindings/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was automatically generated by ACR v0.8.6
+# This script was automatically generated by ACR v0.8.9
 # @author: pancake <youterm.com>
 # @url:    http://www.nopcode.org
 # @repo:   hg clone http://hg.youterm.com/acr
@@ -139,22 +139,28 @@ System types:
   --target=TARGET        configure for building compilers for TARGET [HOST]
 EOF2
 
-printf "\nOptional Features:
+printf "
+Optional Features:
   --enable-devel         Enable development mode (use valabind and swig) 
   --with-cc              Define C compiler to use (gcc by default)  (USERCC=gcc)
   --with-cxx             Define C++ compiler to use (g++ by default)  (USERCXX=g++)
-  --with-ostype          Choose OS type (gnulinux windows darwin)  (USEROSTYPE=auto)\n"
-printf "\nSome influential environment variables:
+  --with-ostype          Choose OS type (gnulinux windows darwin)  (USEROSTYPE=auto)
+"
+printf "
+Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
+  CPPFLAGS    C preprocessor flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags\n"
-printf "\nReport bugs to: pancake <pancake@nopcode.org>"
+  CXXFLAGS    C++ compiler flags
+"
+printf "
+Report bugs to: pancake <pancake@nopcode.org>"
 echo ""
 exit 0
 }
@@ -169,7 +175,7 @@ take_environ() {
 }
 
 show_version() {
-echo "radare2-bindings-0.9.1hg configuration script done with acr v0.8.6.
+echo "radare2-bindings-0.9.1hg configuration script done with acr v0.8.9.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <youterm.com>."
 exit 0
@@ -180,6 +186,12 @@ flag=`echo $1| cut -d = -f 1`
 value=`echo $1| awk 'BEGIN{FS="=";}{print $2}'`
 flag2=`echo $flag|cut -f2- -d -| sed -e 's,-,_,g' -e 's,^_,,g'|tr '[a-z]' '[A-Z]'`
 
+if [ "${TARGET_OS}" = "darwin" ]; then
+	LIBPATH=-Wl,-install_name,
+else
+	LIBPATH=-Wl,-R
+fi
+
 case $flag in
 "-h"|"--help"|"--hel"|"--h"|"--he"|"-help")
 	show_usage ; ;;
@@ -224,7 +236,7 @@ echo "FLAGS:     --enable-devel --with-cc=gcc --with-cxx=g++ --with-ostype=auto"
 "--localstatedir")
 	LOCALSTATEDIR="$value"; ;;
 "--libdir")
-	LIBDIR="$value"; LDFLAGS="${LDFLAGS} -L$value -Wl,-R$value"; ;;
+	LIBDIR="$value"; LDFLAGS="${LDFLAGS} -L$value ${LIBPATH}$value"; ;;
 "--includedir")
 	INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
 "--infodir")
@@ -253,7 +265,7 @@ parse_options $1
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C CXX CXXFLAGS HAVE_LANG_CXX HAVE_VALABIND VALABIND HAVE_SWIG SWIG HAVE_GIRCOMPILER GIRCOMPILER DEVEL_MODE USERCC USERCXX USEROSTYPE FOO HAVE_PKGCFG_R_CORE"
+ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C CXX CXXFLAGS HAVE_LANG_CXX HAVE_VALABIND VALABIND HAVE_SWIG SWIG HAVE_GIRCOMPILER GIRCOMPILER DEVEL_MODE USERCC USERCXX USEROSTYPE FOO HAVE_PKGCFG_R_CORE"
 
 create_environ
 
@@ -278,7 +290,7 @@ if [ "${CROSSBUILD}" = 1 ]; then
  if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
 fi
 echo "main(){}" > test.c
- (exec ${CC} ${CFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
+ (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
 if [ $? = 0 ]; then echo ${CC}; else
  echo no ; HAVE_LANG_C=0
 do_remove