X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b66977f1af8e3715695be2ac061db7b2c9f4e8da..6732f195e3a0b0a995b8050235a2d0a2efe2fa57:/configure.ac

diff --git a/configure.ac b/configure.ac
index 4e18eb0..2a2348a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,55 @@ AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])
 CHECK_GNU_MAKE
-AS_IF([test "x$_cv_gnu_make_command" = x], [AC_MSG_ERROR([You need GNU make])])
+AC_SUBST([GMAKE], [$_cv_gnu_make_command])
+AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
+AC_PATH_PROGS([_BASH], [bash])
+AS_IF([test "x$_BASH" = x], [AC_MSG_ERROR([You need GNU bash])])
+AC_PATH_PROGS([TIME], [time])
+AC_DEFUN([CY_CHECK_PROGS_VERSION], [
+	AC_MSG_CHECKING(for ]$2[ >= ]$5[)
+	AC_PATH_PROGS_FEATURE_CHECK(]$1[, ]$3[,
+		AS_VERSION_COMPARE(`$ac_path_]$1[ ]$4[`, ]$5[, ,
+			ac_cv_path_]$1[=$ac_path_]$1[
+		,
+			ac_cv_path_]$1[=$ac_path_]$1[
+		)
+	,
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR(You need ]$2[ ]$5[ or greater)
+	)
+	AC_SUBST(]$1[, $ac_cv_path_]$1[)
+	AC_MSG_RESULT($]$1[)
+])
+AC_ARG_VAR([BISON], [GNU Project parser generator (yacc replacement)])
+CY_CHECK_PROGS_VERSION([BISON], [bison], [bison],
+	[-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3])
+AC_ARG_VAR([FLEX], [the fast lexical analyser generator])
+CY_CHECK_PROGS_VERSION([FLEX], [flex], [flex],
+	[--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [2.5.33])
+AC_ARG_VAR([GPERF], [perfect hash function generator])
+CY_CHECK_PROGS_VERSION([GPERF], [gperf], [gperf],
+	[--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3])
+AC_PROG_INSTALL
+AC_MSG_CHECKING([for GNU tar >=1.19])
+AC_PATH_PROGS_FEATURE_CHECK([GNUTAR], [tar gtar gnutar], [
+	AS_IF([test "x`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar)/&/p;d'`" != x], [
+		AS_VERSION_COMPARE([`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'`], [1.19], , [
+			ac_cv_path_GNUTAR=$ac_path_GNUTAR
+		], [
+			ac_cv_path_GNUTAR=$ac_path_GNUTAR
+		])
+	])
+])
+AS_IF([test "x$ac_cv_path_GNUTAR" != x], [
+	AC_SUBST([GNUTAR], [$ac_cv_path_GNUTAR])
+	AC_MSG_RESULT([$GNUTAR])
+], [
+	AC_SUBST([GNUTAR], [:])
+	AC_MSG_RESULT([no])
+])
+AC_CHECK_PROGS([SVN], [svn])
+AC_CHECK_PROGS([SVNVERSION], [svnversion])
 AC_PROG_CXX
 AC_PROG_OBJCXX
 AC_ARG_WITH([frameworks], [AS_HELP_STRING(
@@ -19,49 +67,13 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
 	done
 ])
 AC_LANG([C++])
-AC_PROG_SED
-AX_PROG_BISON([
-	BISON=`echo $YACC | $SED -e 's/ -y//'`
-	BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'`
-], [AC_MSG_ERROR([You need bison 2.3 or greater])])
-AC_PROG_AWK
-AC_MSG_CHECKING([if bison is >= 2.3])
-AS_VERSION_COMPARE([$BISON_VERSION], [2.3], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([You need bison 2.3 or greater])
-], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])])
-AC_SUBST([BISON])
-AX_PROG_FLEX([
-	FLEX=$LEX
-	FLEX_VERSION=[`$FLEX --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'`]
-], [AC_MSG_ERROR([You need flex 2.5.33 or greater])])
-AC_MSG_CHECKING([if flex is >= 2.5.33])
-AS_VERSION_COMPARE([$FLEX_VERSION], [2.5.33], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([You need flex 2.5.33 or greater])
-], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])])
-AC_SUBST([FLEX])
-AC_CHECK_PROGS([_BASH], [bash])
-AC_ARG_VAR([GPERF], [perfect hash function generator])
-AC_CHECK_PROGS([GPERF], [gperf])
-AC_MSG_CHECKING([if gperf >= 3.0.3])
-GPERF_VERSION=[`$GPERF --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'`]
-AS_VERSION_COMPARE([$GPERF_VERSION], [3.0.3], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([You need gperf 3.0.3 or greater])
-], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])])
-AC_CHECK_PROGS([TIME], [time])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
 	AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
 	AC_SUBST([LTLIBAPR], [`$apr_config --link-libtool`])
 ], [AC_MSG_ERROR([You need apr])])
 VL_LIB_READLINE
-AC_PROG_INSTALL
-AC_LANG_PUSH([C])
-AM_ICONV
-AC_LANG_POP([C])
-AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
+AS_CASE([$vl_cv_lib_readline], [no], [AC_MSG_ERROR([You need readline])])
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
 	PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [
 		CY_EXECUTE=1
@@ -127,6 +139,7 @@ AS_CASE([$CY_EXECUTE], [1], [
 				#include <WebKit/WebScriptObject.h>
 			], [[[[WebScriptObject alloc] init];]])
 		], [
+			AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation])
 			AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
 			AS_IF([test "x$GNUSTEP_CONFIG" != x], [
 				AC_SUBST([CY_OBJECTIVEC])
@@ -137,10 +150,17 @@ AS_CASE([$CY_EXECUTE], [1], [
 	])
 	AC_LANG_POP([Objective C++])
 ])
+AC_LANG_PUSH([C])
+AM_ICONV
+AC_LANG_POP([C])
+AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
 AS_IF([test "x$CY_OBJECTIVEC" = x1], [
 	AC_CHECK_HEADER([mach/mach.h], [
 		AS_CASE([$OTOOL], [:], [AC_MSG_WARN([Missing otool?])], [AC_SUBST([CY_OBJECTIVEC_MACH], [1])])
 	])
 ])
+AS_IF([test "x$GMAKE" != xmake], [
+	AC_CONFIG_FILES([Makefile])
+])
 AC_CONFIG_FILES([GNUmakefile])
 AC_OUTPUT