GNUstep worky.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7d40d50b92c23386758a944b8a70020b5a70b86a..6277f6739060b29d94b4a7882b4e9574159ea12e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])
+AC_PROG_CXX
+AC_LANG([C++])
 AX_PROG_BISON([
        BISON=`echo $YACC | $SED -e 's/ -y//'`
        BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'`
@@ -40,7 +42,6 @@ AS_CASE([$apr_found], [yes], [
        AC_SUBST([LTLIBAPR], [`$apr_config --link-libtool`])
 ], [AC_MSG_ERROR([You need apr])])
 VL_LIB_READLINE
-AC_PROG_CXX
 AC_PROG_INSTALL
 AM_ICONV
 AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
@@ -71,12 +72,28 @@ AS_CASE([$WEBKIT], [yes], [
                ])
        ])
 ], [
-       AC_SUBST([CY_EXECUTE], [0])
        AC_MSG_WARN([No JavaScript engine!])
 ])
+AC_PROG_OBJCXX
+AC_LANG_PUSH([Objective C++])
+AC_MSG_CHECKING([if we really have Objective C++])
+AC_COMPILE_IFELSE([
+// This space intentionally left blank
+], [
+       CY_OBJECTIVEC=1
+       AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+AC_LANG_POP([Objective C++])
+AS_IF([test "x$CY_OBJECTIVEC" = x1], [
+       # TODO: Darwin
+       AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
+       AS_IF([test "x$GNUSTEP_CONFIG" != x], [
+               AC_SUBST([CY_OBJECTIVEC])
+               AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`])
+               AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`])
+       ])
+])
 CHECK_GNU_MAKE
 AS_IF([test "x$_cv_gnu_make_command" = x], [AC_MSG_ERROR([You need GNU make])])
-# XXX: gnustep
-AC_PROG_OBJCXX
 AC_CONFIG_FILES([GNUmakefile])
 AC_OUTPUT