[fondue-commits] [SCM] Fondue is an editor for outline fonts. branch, master, updated. c598f3702697991c0499546caf5b9e114289b99b

[Eugeniy Meshcheryakov]

The branch, master has been updated
       via  c598f3702697991c0499546caf5b9e114289b99b (commit)
       via  70b90928b58e86778a0a26d17e7e9f7806fbfbbb (commit)
      from  ae6ff516b1412f9cdb1f7cbd172b4b672e5fa7b9 (commit)


- Log -----------------------------------------------------------------
commit c598f3702697991c0499546caf5b9e114289b99b
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Aug 14 16:25:18 2007 +0200

    check if ruby.h contains RSTRING_PTR and RSTRING_LEN
    Those macros are only available in ruby >= 1.8.6

commit 70b90928b58e86778a0a26d17e7e9f7806fbfbbb
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Aug 14 16:13:16 2007 +0200

    make C++ default language

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index aed0228..6c5e6b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
+AC_LANG([C++])
 
 PKG_CHECK_MODULES([QtCore], [QtCore >= 4.3])
 PKG_CHECK_MODULES([QtGui], [QtGui >= 4.3])
@@ -39,6 +40,23 @@ ruby_LIBS="${ruby_libpath:+-L$ruby_libpath} ${ruby_libarg}"
 AC_MSG_RESULT([$ruby_LIBS])
 AC_SUBST([ruby_LIBS])
 
+saved_CPPFLAGS=${CPPFLAGS}
+CPPFLAGS=${ruby_CFLAGS}
+AC_MSG_CHECKING([if ruby.h has RSTRING_PTR and RSTRING_LEN])
+AC_COMPILE_IFELSE([#include <ruby.h>
+int main(int argc, char **argv)
+{
+	VALUE data;
+	RSTRING_PTR(data);
+	RSTRING_LEN(data);
+	return 0;
+}
+],
+[AC_MSG_RESULT([yes])],
+[AC_MSG_ERROR([no
+please make sure that you have recent version of ruby installed (>= 1.8.6).])])
+CPPFLAGS=${saved_CPPFLAGS}
+
 ## TODO detect xsltproc
 
 AC_CONFIG_FILES([Makefile])

-- 
Fondue is an editor for outline fonts.