Changeset 1081 for trunk/configure.in

Timestamp:

Jul 31, 2008 9:20:59 AM (16 years ago)

Author:

gah

Message:

fix for perl, ruby bindings; visviewer SendBytes? method sends all data at once

File:

• trunk/configure.in (modified) (7 diffs)

trunk/configure.in

@@ -1 +1 @@
 AC_INIT([Rappture], [1.1], [rappture@nanohub.org])
+AC_CONFIG_AUX_DIR(cf)
 
 #------------------------------------------------------------------------
@@ -72 +73 @@
 fi
 AC_SUBST(ENABLE_GUI)
-
-dnl AC_ARG_ENABLE(
-dnl     [tcl],
-dnl     [AS_HELP_STRING([--enable-tcl], [build tcl bindings @<:@default=check@:>@])],
-dnl     [],
-dnl     [enable_tcl=check])
-dnl
-dnl BUILD_TCL=yes
-dnl AC_SUBST(BUILD_TCL)
 
 with_tclsh="check"
@@ -168 +160 @@
 AC_SUBST(MKOCTFILE)
 
-
-dnl perl and python check borrowed from
-dnl http://www.opensource.apple.com/darwinsource/Current/libxslt-8.1/libxslt/configure.in
-dnl
-dnl Perl is just needed for generating some data for XSLtmark
-dnl
-
-dnl AC_ARG_ENABLE(
-dnl     [perl],
-dnl     [AS_HELP_STRING([--enable-perl], [build perl bindings @<:@default=check@:>@])],
-dnl     [],
-dnl     [enable_perl=check])
-
-dnl BUILD_PERL=yes
-dnl AC_SUBST(BUILD_PERL)
 
 AC_ARG_WITH(
@@ -215 +192 @@
 AC_SUBST(PERL_SITE_PACKAGES)
 
-dnl
-dnl check for python
-dnl
-
-dnl AC_ARG_ENABLE(
-dnl     [python],
-dnl     [AS_HELP_STRING([--enable-pyton], [build python bindings @<:@default=check@:>@])],
-dnl     [],
-dnl     [enable_python=check])
-dnl 
-dnl BUILD_PYTHON=yes
-dnl AC_SUBST(BUILD_PYTHON)
-
 PYTHON=""
 PYTHON_CFLAGS=""
 PYTHON_CPPFLAGS=""
-PYTHON_DISTUTILS=""
+HAVE_PYTHON_DISTUTILS=""
 PYTHON_INCLUDES=""
 PYTHON_LDFLAGS=""
@@ -293 +257 @@
         build build_ext 2>&1 > /dev/null
   if test $? = 0 ; then
-    PYTHON_DISTUTILS="yes"
-  else
-    PYTHON_DISTUTILS="no"
-  fi
-  AC_MSG_RESULT([$PYTHON_DISTUTILS])
+    HAVE_PYTHON_DISTUTILS="yes"
+  else
+    HAVE_PYTHON_DISTUTILS="no"
+  fi
+  AC_MSG_RESULT([$HAVE_PYTHON_DISTUTILS])
   
-  if test "${PYTHON_DISTUTILS}" = "yes"; then
+  if test "${HAVE_PYTHON_DISTUTILS}" = "yes"; then
     #
     # Check for Python include path
@@ -327 +291 @@
 fi  
 AC_SUBST(pythondir)
-dnl AC_SUBST(PYTHON_SUBDIR)
-
-echo "PYTHON=${PYTHON}"
-echo "PYTHON_CPPFLAGS=${PYTHON_CPPFLAGS}"
-echo "PYTHON_DISTUTILS=${PYTHON_DISTUTILS}"
-echo "PYTHON_INCLUDES=${PYTHON_INCLUDES}"
-echo "PYTHON_LDFLAGS=${PYTHON_LDFLAGS}"
-echo "PYTHON_LIB=${PYTHON_LIB}"
-echo "PYTHON_LIBDIR=${PYTHON_LIBDIR}"
-echo "PYTHON_SITE_DIR=${PYTHON_SITE_DIR}"
-echo "PYTHON_SITE_PACKAGES=${PYTHON_SITE_PACKAGES}"
-echo "PYTHON_VERSION=${PYTHON_VERSION}"
-echo "pythondir=${pythondir}"
 
 AC_SUBST(PYTHON)
@@ -345 +296 @@
 AC_SUBST(PYTHON_INCLUDES)
 AC_SUBST(PYTHON_SITE_PACKAGES)
-AC_SUBST(PYTHON_DISTUTILS)
-
-AC_ARG_WITH(
-    [ruby],
-    [AS_HELP_STRING([--with-ruby[=DIR]], [location of ruby @<:@default=check@:>@])],
-    [],
-    [with_ruby=check])
+AC_SUBST(HAVE_PYTHON_DISTUTILS)
+
+rappture_with_ruby="yes"
 
 RUBY=""
-if test "$with_ruby" != "no" ; then
-    AC_MSG_CHECKING([for ruby])
-    if test -x "$with_ruby/bin/ruby"
-    then
-        echo Found perl in $with_ruby/bin/ruby
-        PERL="$with_ruby/bin/ruby"
-    else
-        if test -x "$with_ruby"
-        then
-            echo Found ruby in $with_ruby
-            PERL="$with_ruby"
-        else
-            AC_PATH_PROG(RUBY, ruby)
-        fi
-    fi
-fi
-
-AC_MSG_RESULT([${RUBY}])
+RUBY_DEV_PKG="no"
+
+AC_ARG_WITH(ruby, 
+  AS_HELP_STRING([--with-ruby=PATH], [absolute path to ruby executable]), 
+  [rappture_with_ruby=$with_val])
+if test "${rappture_with_ruby}" != "no" ; then 
+  if test "${rappture_with_ruby}" = "yes" ; then
+    AC_PATH_PROG(RUBY, ruby)
+  else
+    AC_PATH_PROG(RUBY, ruby, 
+      [${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}])
+  fi
+fi
 AC_SUBST(RUBY)
+
+if test "x${RUBY}" != "x" ; then
+  AX_PROG_RUBY_VERSION
+  ac_mkmf_result=`${RUBY} -r mkmf -e ";" 2>&1`
+  if test -z "$ac_mkmf_result"; then
+    HAVE_RUBY_DEVEL="yes"
+    AX_RUBY_DEV_FLAGS([${RUBY}])
+  fi
+fi
+AC_SUBST(HAVE_RUBY_DEVEL)
 
 RP_BASE=`pwd`