X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9d13f949e19c9abd5500fe826f33cf03f0b7eb0b..541654b492a36d0a36862a785ee2fbe8dab77207:/configure.ac

diff --git a/configure.ac b/configure.ac
index 446e6c6..3900105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])
-CHECK_GNU_MAKE
+AX_CHECK_GNU_MAKE
 AC_SUBST([GMAKE], [$_cv_gnu_make_command])
 AC_SUBST([LTFLAGS])
 AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
@@ -53,10 +53,10 @@ AS_IF([test "x$ac_cv_path_GNUTAR" != x], [
 	AC_SUBST([GNUTAR], [:])
 	AC_MSG_RESULT([no])
 ])
-AC_CHECK_PROGS([SVN], [svn])
-AC_CHECK_PROGS([SVNVERSION], [svnversion])
+AC_CHECK_PROGS([GIT], [git])
 AC_PROG_CXX
 AC_PROG_OBJCXX
+AC_LANG([C++])
 AC_DEFUN([CY_CHECK_UNIVERSAL], [
 	AC_MSG_CHECKING([for universal binary support])
 	AS_CASE([$host_vendor], [apple], [
@@ -93,7 +93,6 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
 		AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], [-F$cy_framework])
 	done
 ])
-AC_LANG([C++])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
 	AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
@@ -197,6 +196,7 @@ AS_CASE([$am_cv_func_iconv], [yes], [], [
 ])
 AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
 AC_LANG_POP([C])
+AC_SUBST([SO], [$acl_shlibext])
 AS_IF([test "x$CY_OBJECTIVEC" = x1], [
 	AC_CHECK_HEADER([mach/mach.h], [
 		AC_CHECK_TOOLS([_OTOOL], [otool])
@@ -205,7 +205,6 @@ AS_IF([test "x$CY_OBJECTIVEC" = x1], [
 		AS_IF([test "x$_LIPO" = x], [AC_MSG_ERROR([You need lipo])])
 		AC_CHECK_TOOLS([_NM], [nm])
 		AS_IF([test "x$_NM" = x], [AC_MSG_ERROR([You need nm])])
-		AC_SUBST([SO], [$acl_shlibext])
 		AC_SUBST([CY_OBJECTIVEC_MACH], [1])
 		AC_SUBST([CY_ATTACH_GROUP], [procmod])
 	])