Remove empty compound expressions generated by CYVar.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3f2e5b98db3f32d2dbcc874f1afc0cb200009e75..3900105a4077ee244d874aa2dd55b46b9434413b 100644 (file)
--- 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])
 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])])
 AC_SUBST([GMAKE], [$_cv_gnu_make_command])
 AC_SUBST([LTFLAGS])
 AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])


@@ -53,8 +53,7 @@ AS_IF([test "x$ac_cv_path_GNUTAR" != x], [
        AC_SUBST([GNUTAR], [:])
        AC_MSG_RESULT([no])
 ])
        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_PROG_CXX
 AC_PROG_OBJCXX
 AC_LANG([C++])


@@ -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])
 ])
 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])
 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])])
                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])
        ])
                AC_SUBST([CY_OBJECTIVEC_MACH], [1])
                AC_SUBST([CY_ATTACH_GROUP], [procmod])
        ])