* Fix recursive include issue in build

- Oops O:)
* Some fixups at ACR level for allowing --without-vala flag properly
* Added empty r_sys_cmd() APIs for r_util

config-user.mk.acr

@@ -11,5 +11,5 @@ RUNTIME_DEBUG=1
 # TODO: add flag to choose ostype
 OSTYPE?=gnulinux
 
--include ../config.mk
+#-include ../config.mk
 -include ../../config.mk

configure

@@ -17,7 +17,7 @@ control_c() {
 }
 trap control_c 2
 HAVE_EWF=1
-VALA=1
+WANT_VALA=1
 split_host() {
 S="$"
 while : ; do
@@ -226,7 +226,7 @@ echo "FLAGS:     --without-ewf --without-vala"
 	MANDIR="$value"; ;;
 
 "--without-ewf") HAVE_EWF="0"; ;;
-"--without-vala") VALA="0"; ;;
+"--without-vala") WANT_VALA="0"; ;;
 *) if [ "$value" ]; then eval "`echo $flag2=$value`" ; 
 else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;;
 esac
@@ -241,7 +241,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 HAVE_LIB_EWF HAVE_EWF VALA HAVE_VALAC VALAC HAVE_VALA_1_0_VERSION_0_5_0"
+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 HAVE_LIB_EWF HAVE_EWF WANT_VALA HAVE_VALAC VALAC HAVE_VALA_1_0_VERSION_0_5_0"
 
 create_environ
 
@@ -309,6 +309,7 @@ else
  HAVE_VALAC=0
  VALAC=valac
  echo no ; fi
+if [ "$WANT_VALA" = "1" ]; then
 HAVE_VALA_1_0_VERSION_0_5_0=0
 printf "checking version of library vala-1.0 >= 0.5.0... "
 pkg-config --atleast-version=0.5.0 vala-1.0 >/dev/null 2>&1
@@ -316,7 +317,10 @@ if [ $? = 0 ]; then HAVE_VALA_1_0_VERSION_0_5_0=1 ; echo ok; else
 echo "no" ; fi
 if [ "$HAVE_VALA_1_0_VERSION_0_5_0" = "0" ]; then
 echo "   Needs vala 0.5.0 at least" >&2 
-export HAVE_VALAC="0 VALAC = ''"; fi
+export HAVE_VALAC="0"
+export VALAC=""; fi
+else
+export HAVE_VALAC="0"; fi
 SEDFLAGS=" -e '"
 COUNT=0
 for A in ${ENVWORDS} ; do

configure.acr

@@ -8,16 +8,22 @@ CHKLIB ewf
 ARG_WITHOUT HAVE_EWF ewf disable EWF dependency ;
 IF HAVE_EWF { HAVE_LIB_EWF = 0 ; }
 
-ARG_WITHOUT VALA vala disables the build of all the vala-dependant parts ;
+ARG_WITHOUT WANT_VALA vala disables the build of all the vala-dependant parts ;
 CHKPRG VALAC valac
-CHKVER vala-1.0 0.5.0
+
 (( temporary fix to avoid vala ))
-IFNOT HAVE_VALA_1_0_VERSION_0_5_0 {
-	ECHO Needs vala 0.5.0 at least ;
-	HAVE_VALAC = 0
-	VALAC = '' ;
+IF WANT_VALA { 
+	CHKVER vala-1.0 0.5.0
+	IFNOT HAVE_VALA_1_0_VERSION_0_5_0 {
+		ECHO Needs vala 0.5.0 at least ;
+		HAVE_VALAC = 0 ;
+		VALAC = '' ; 
+	}
+}{
+	HAVE_VALAC = 0 ;
 }
 
 REPORT PREFIX HAVE_LIB_EWF HAVE_VALAC ;
 
 SUBDIRS ./config-user.mk ;
+

libr/util/Makefile

@@ -1,5 +1,5 @@
 NAME=r_util
-OBJ=mem.o num.o str.o re.o hex.o file.o alloca.o float.o prof.o cache.o
+OBJ=mem.o num.o str.o re.o hex.o file.o alloca.o float.o prof.o cache.o sys.o
 
 #CFLAGS+=-O2
 #CC=gcc-4.1.1

libr/util/sys.c

@@ -0,0 +1,11 @@
+/* TODO: import stuff fron bininfo/p/bininfo_addr2line */
+
+char *r_sys_cmd_str(const char *cmd)
+{
+	return NULL;
+}
+
+char *r_sys_cmd_strf(const char *cmd, ...)
+{
+	return NULL;
+}