Changeset 2705 for branches

Timestamp:

Nov 28, 2011 1:21:34 PM (12 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (2 diffs)
• lang/tcl/src/Makefile.in (modified) (3 diffs)
• src/core/config.h.in (modified) (2 diffs)

branches/blt4/configure

@@ -780 +780 @@
 with_tclsh
 with_vtk
+with_ncurses
 with_matlab
 with_octave
@@ -1433 +1434 @@
   --with-tclsh=DIR        location of tclsh [default=yes]
   --with-vtk=DIR          location of vtk library [default=yes]
+  --with-ncurses=DIR      location of ncurses [default=yes]
   --with-matlab=DIR       location of matlab and mex compiler [default=yes]
   --with-octave=DIR       path of default octave compiler `mkoctfile'
@@ -2719 +2721 @@
 
 
-with_tclsh=yes
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -2739 +2739 @@
   with_install=yes
 fi
+
 
 if test "$with_install" != "yes"; then
@@ -4905 +4906 @@
   as_fn_error $? "librappture requires libm" "$LINENO" 5
 fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clrtoeol in -lncurses" >&5
+$as_echo_n "checking for clrtoeol in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_clrtoeol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clrtoeol ();
+int
+main ()
+{
+return clrtoeol ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_clrtoeol=yes
+else
+  ac_cv_lib_ncurses_clrtoeol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clrtoeol" >&5
+$as_echo "$ac_cv_lib_ncurses_clrtoeol" >&6; }
+if test "x$ac_cv_lib_ncurses_clrtoeol" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNCURSES 1
+_ACEOF
+
+  LIBS="-lncurses $LIBS"
+
+else
+  as_fn_error $? "ncursers library missing?" "$LINENO" 5
+fi
+
+for ac_header in ncurses.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NCURSES_H 1
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ncurses headers missing ?" >&5
+$as_echo "$as_me: WARNING: ncurses headers missing ?" >&2;}
+fi
+
+done
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
@@ -7375 +7440 @@
 $as_echo "$VTKDIR" >&6; }
 
-
-with_matlab="yes"
+with_ncurses="yes"
+
+# Check whether --with-ncurses was given.
+if test "${with_ncurses+set}" = set; then :
+  withval=$with_ncurses;
+else
+  with_ncurses=yes
+fi
+
+
+if test "$with_vtk" != "no" ; then
+  if test "$with_vtk" = "yes" ; then
+    for path in \
+     $libdir \
+     $prefix/lib \
+     $exec_prefix/lib \
+     /usr/lib
+    do
+      for vtk in $path/vtk-* ; do
+        if test -d "${vtk}" ; then
+          VTKDIR=${vtk}
+        fi
+      done
+      if test "x${VTKDIR}" != "x" ; then
+        break
+      fi
+    done
+  fi
+fi
+
+
 
 # Check whether --with-matlab was given.

branches/blt4/configure.in

@@ -60 +60 @@
 
 AC_CHECK_LIB(m, main,,AC_MSG_ERROR(librappture requires libm))
+
+AC_CHECK_LIB(ncurses, clrtoeol,,AC_MSG_ERROR([ncursers library missing?]))
+AC_CHECK_HEADERS(ncurses.h,,AC_MSG_WARN(ncurses headers missing ?))
+
 AC_CHECK_LIB(stdc++, main,,AC_MSG_ERROR(librappture requires libstdc++))
 AC_CHECK_HEADERS(algorithm,,AC_MSG_WARN(STL classes missing ?))
@@ -195 +199 @@
 fi
 AC_MSG_RESULT([$VTKDIR])
+
+with_ncurses="yes"
+AC_ARG_WITH(
+    [ncurses],
+    [AS_HELP_STRING([--with-ncurses[=DIR]],
+        [location of ncurses @<:@default=yes@:>@])],
+    [],
+    [with_ncurses=yes])
+
+if test "$with_vtk" != "no" ; then
+  if test "$with_vtk" = "yes" ; then
+    for path in \
+     $libdir \
+     $prefix/lib \
+     $exec_prefix/lib \
+     /usr/lib
+    do
+      for vtk in $path/vtk-* ; do 
+        if test -d "${vtk}" ; then
+          VTKDIR=${vtk}
+        fi
+      done
+      if test "x${VTKDIR}" != "x" ; then
+        break
+      fi
+    done
+  fi
+fi
 
 RP_LANG_MATLAB

branches/blt4/lang/tcl/src/Makefile.in

@@ -28 +28 @@
 TCL_VERSION     = @TCL_VERSION@
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
+HAVE_NCURSES    = @HAVE_LIBNCURSES@
 
 CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
@@ -49 +51 @@
 LIBS = \
         -L../../../src/core -lrappture \
-        $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++
+        $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++
 
 OBJS = \
         Rappture_Init.o \
-        RpCurses.o \
         RpDaemon.o \
         RpEncodeTclInterface.o \
@@ -70 +71 @@
 endif
 
-FFMPEG          = @HAVE_FFMPEG_LIBS@
-ifeq ($(FFMPEG),yes)
+ifeq ($(HAVE_LIBCURSES),yes)
+   OBJS += RpCurses.o
+   LIBS += -lncurses 
+endif
+
+ifeq ($(HAVE_FFMPEG),yes)
     OBJS += RpVideoTclInterface.o
     LIBS += -L../../../src/objects -lRpObjects

branches/blt4/src/core/config.h.in

@@ -79 +79 @@
 #undef HAVE_LIBM
 
+/* Define to 1 if you have the `ncurses' library (-lncurses). */
+#undef HAVE_LIBNCURSES
+
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
@@ -99 +102 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ncurses.h> header file. */
+#undef HAVE_NCURSES_H
+
+/* Define to 1 if you have the <Python.h> header file. */
+#undef HAVE_PYTHON_H
 
 /* Define to 1 if you have the <sstream> header file. */