Changeset 2309 for branches/blt4/configure.in

Timestamp:

Jul 10, 2011 6:46:19 PM (13 years ago)

Author:

gah

Message:

fixes for grid build

File:

• branches/blt4/configure.in (modified) (8 diffs)

branches/blt4/configure.in

@@ -137 +137 @@
 done
 
-
-rp_with_tclsh="yes"
+AC_ARG_WITH(
+    [ffmpeg],
+    [AS_HELP_STRING([--with-ffmpeg[=DIR]],
+      [location of ffmpeg @<:@default=yes@:>@])],
+    [],
+    [with_ffmpeg=yes])
+
 AC_ARG_WITH(
     [tclsh],
     [AS_HELP_STRING([--with-tclsh[=DIR]],
-        [location of tclsh @<:@default=yes@:>@])],
-    [rp_with_tclsh=$withval],
-    [rp_with_tclsh=yes])
+      [location of tclsh @<:@default=yes@:>@])],
+    [],
+    [with_tclsh=yes])
 
 TCLSH=""
-if test "${rp_with_tclsh}" != "no" ; then
+if test "${with_tclsh}" != "no" ; then
   tclsh="tclsh${TCL_VERSION}"
-  if test "${rp_with_tclsh}" = "yes" ; then 
+  if test "${with_tclsh}" = "yes" ; then 
     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
   else 
-    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${rp_with_tclsh}/bin:${rp_with_tclsh}])
+    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
   fi
   if test "x${TCLSH}" = "x" ; then
@@ -166 +171 @@
     [AS_HELP_STRING([--with-vtk[=DIR]],
         [location of vtk library @<:@default=yes@:>@])],
-    [rp_with_vtk=$withval], [rp_with_vtk=yes])
+    [], 
+    [with_vtk=yes])
 
 AC_MSG_CHECKING([for vtk])
 VTKDIR=""
 
-if test "$rp_with_vtk" != "no" ; then
-  if test "$rp_with_vtk" = "yes" ; then
+if test "$with_vtk" != "no" ; then
+  if test "$with_vtk" = "yes" ; then
     for path in \
      $libdir \
@@ -198 +204 @@
 RP_LANG_JAVA
 
-rp_with_ruby="yes"
-
 RUBY=""
 RUBY_DEV_PKG="no"
@@ -206 +210 @@
     [ruby],
     [AS_HELP_STRING([--with-ruby=DIR], [location of ruby @<:@default=yes@:>@])],
-    [rp_with_ruby=$withval])
-
-if test "${rp_with_ruby}" != "no" ; then
-  if test "${rp_with_ruby}" = "yes" ; then
+    [],
+    [with_ruby="yes"])
+
+if test "${with_ruby}" != "no" ; then
+  if test "${with_ruby}" = "yes" ; then
     AC_PATH_PROG(RUBY, ruby)
   else
-    AC_PATH_PROG(RUBY, ruby, [], [${rp_with_ruby}/bin:${rp_with_ruby}])
+    AC_PATH_PROG(RUBY, ruby, [], [${with_ruby}/bin:${with_ruby}])
   fi
 fi
@@ -229 +234 @@
 fi
 
-rp_with_java="yes"
-JAVA=""
-JAVAH=""
-JAVAC=""
-JAVA_DEV_PKG="no"
-AC_ARG_WITH(
-    [java],
-    [AS_HELP_STRING([--with-java=DIR], [location of java @<:@default=yes@:>@])],
-    [rp_with_java=$withval])
-
-if test "${rp_with_java}" != "no" ; then
-  if test "${rp_with_java}" = "yes" ; then
-    AC_PATH_PROG(JAVA,  java)
-    AC_PATH_PROG(JAVAC, javac)
-    AC_PATH_PROG(JAVAH, javah)
-  else
-    AC_PATH_PROG(JAVA,  java,  [], [${rp_with_java}/bin:${rp_with_java}])
-    AC_PATH_PROG(JAVAC, javac, [], [${rp_with_java}/bin:${rp_with_java}])
-    AC_PATH_PROG(JAVAH, javah, [], [${rp_with_java}/bin:${rp_with_java}])
-  fi
-fi
-JDK=
-JAVA_HOME=
-JAVA_INC_DIR=
-JAVA_INC_SPEC=
-
-# If java exists, let's look for the jni.h file.
-if test "x${JAVA}" != "x" ; then
-  for d in \
-   /apps/java/jdk1.6.0_01 \
-   /usr/lib/jvm/*sun-1.6* \
-   /opt/sun-jdk-1.6* \
-   /opt/icedtea6-* \
-   /opt/sun-jdk-1.5* \
-   /usr/lib/jvm/*sun-1.5*
-  do
-    if test -r "${d}/include/jni.h" ; then
-      JDK=${d}
-      break;
-    fi
-  done
-  JAVA_HOME=$JDK
-  JAVA_INC_DIR=${JDK}/include
-  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
-fi
-
 
 RP_BASE=`pwd`
@@ -381 +340 @@
 
 HAVE_FFMPEG_LIBS=""
-if [[ \( "${ac_cv_header_ffmpeg_avcodec_h}" = "yes" -o \
+if test "${with_ffmpeg}" != "no"; then
+  if [[ \( "${ac_cv_header_ffmpeg_avcodec_h}" = "yes" -o \
         "${ac_cv_header_libavcodec_avcodec_h}" = "yes" \) -a \
      \( "${ac_cv_header_ffmpeg_avformat_h}" = "yes" -o \
@@ -389 +349 @@
      \( "${ac_cv_header_ffmpeg_swscale_h}" = "yes" -o \
         "${ac_cv_header_libswscale_swscale_h}" = "yes" \) ]] ; then
-  HAVE_FFMPEG_LIBS="yes"
-  AC_DEFINE(BUILD_with_ffmpeg, 1, [Build rappture with ffmpeg widgets])
-else
-  HAVE_FFMPEG_LIBS=""
+    HAVE_FFMPEG_LIBS="yes"
+    AC_DEFINE(BUILD_with_ffmpeg, 1, [Build rappture with ffmpeg widgets])
+  fi
 fi
 
@@ -418 +377 @@
 AC_SUBST(MEXEXT)
 AC_SUBST(MEX_ARCH)
-AC_SUBST(MKOCTFILE)
 AC_SUBST(MKOCTFILE2)
 AC_SUBST(MKOCTFILE3)
-AC_SUBST(OCTAVE)
-AC_SUBST(OCTAVE2)
-AC_SUBST(OCTAVE3)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)