[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. cb80ff8c06e34e34cd88cee1e2ba8b569d27ef4f

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit cb80ff8c06e34e34cd88cee1e2ba8b569d27ef4f
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Wed Apr 2 14:14:12 2008 +0200

    do not try to find ruby

diff --git a/configure.ac b/configure.ac
index c2464b9..860a0d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,16 +12,6 @@ AC_LANG([C++])
 
 AC_PROG_AWK
 
-AC_ARG_ENABLE([ruby],
-	      AS_HELP_STRING([--enable-ruby], [compile with ruby support (default is YES)]),
-	      [case "${enableval}" in
-	         yes) enable_ruby=true ;;
-		 no) enable_ruby=false ;;
-		 *) AC_MSG_ERROR([bad value ${enableval} for --enable-ruby]);;
-	       esac], [enable_ruby=true])
-
-AM_CONDITIONAL([RUBY_SUPPORT], [test x$enable_ruby = xtrue])
-
 PKG_CHECK_MODULES([QtCore], [QtCore >= 4.3])
 PKG_CHECK_MODULES([QtGui], [QtGui >= 4.3])
 PKG_CHECK_MODULES([QtXml], [QtXml >= 4.3])
@@ -33,46 +23,6 @@ then
 	MOC=`$PKG_CONFIG --variable moc_location QtCore`
 fi
 
-AC_ARG_VAR([RUBY], [Ruby interpreter command])
-if test x$enable_ruby = xtrue
-then
-	AC_PATH_PROGS([RUBY], [ruby])
-	if test -z "$RUBY"
-	then
-		AC_MSG_ERROR([ruby required but not found])
-	fi
-
-	AC_MSG_CHECKING([for ruby compile flags])
-	ruby_archdir=[`${RUBY} -e "require 'rbconfig'; print RbConfig::CONFIG['archdir'].to_s"`]
-	ruby_CFLAGS="-I${ruby_archdir}"
-	AC_MSG_RESULT([$ruby_CFLAGS])
-	AC_SUBST([ruby_CFLAGS])
-
-	AC_MSG_CHECKING([for ruby link flags])
-	ruby_libpath=[`${RUBY} -e "require 'rbconfig'; print RbConfig::CONFIG['libpath'].to_s"`]
-	ruby_libarg=[`${RUBY} -e "require 'rbconfig'; print RbConfig::CONFIG['LIBRUBYARG'].to_s"`]
-	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}
-fi
-
 AC_ARG_VAR([XSLTPROC], [XSLT processor command (xsltproc-compatible)])
 AC_PATH_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"

-- 
Fondue Font Editor