Changeset 905

Timestamp:

Feb 26, 2008, 12:47:21 PM (17 years ago)

Author:

dkearney

Message:

added --without-tclsh and --disable-gui configure flags so we can build rappture libraries without the gui for installation on grid machines.

Location:

trunk

Files:

• Makefile.in (modified) (4 diffs)
• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)

trunk/Makefile.in

@@ -37 +37 @@
 
 build_gui:
-        make -C gui
+        @if test "x@ENABLE_GUI@" == "xyes" ; then \
+                make -C gui; \
+        fi
 
 install_gui:
-        make -C gui install
+        @if test "x@ENABLE_GUI@" == "xyes" ; then \
+                make -C gui install; \
+        fi
 
 rplib:
@@ -82 +86 @@
 
 #tcl bindings
+#cd tcl; @TCLSH@ install.tcl
 install_tcl:
-        cd tcl; $(bindir)/tclsh install.tcl
-#       cd tcl; @TCLSH@ install.tcl
-        make -C src/tcl install
+        @if test "x@TCLSH@" != "x" ; then \
+                cd tcl; $(bindir)/tclsh install.tcl; \
+                make -C src/tcl install; \
+        fi
 
 # matlab bindings
@@ -163 +169 @@
 
 distclean:
-        rm examples/demo.bash
+        rm -f examples/demo.bash
         make -C examples/app-fermi/cee distclean
         make -C examples/app-fermi/fortran distclean
@@ -177 +183 @@
         make -C src2/core distclean
         make -C test distclean
-        rm gui/apps/rappture gui/apps/simsim gui/apps/rappture.env;
+        rm -f gui/apps/rappture gui/apps/simsim gui/apps/rappture.env;
         rm -rf Makefile config.status config.log bin;
         rm -f include/*

trunk/configure

@@ -675 +675 @@
 FFLAGS
 ac_ct_F77
+ENABLE_GUI
+TCLSH
 MEX
 MEX_ARCH
@@ -1275 +1277 @@
   cat <<\_ACEOF
 
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-gui            build code related to the graphical user interface
+                          [default=yes]
+
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-tclsh=DIR        location of tclsh [default=check]
   --with-matlab=DIR       location of matlab and mex compiler [default=check]
   --with-matlab-arch=ARCH build Matlab bindings for ARCH architecture
@@ -5077 +5086 @@
 
 
+# Check whether --enable-gui was given.
+if test "${enable_gui+set}" = set; then
+  enableval=$enable_gui;
+else
+  enable_gui=yes
+fi
+
+
+ENABLE_GUI=
+if test "$enable_gui" != "no" ; then
+    ENABLE_GUI="yes"
+fi
+
+
+
+
+# Check whether --with-tclsh was given.
+if test "${with_tclsh+set}" = set; then
+  withval=$with_tclsh;
+else
+  with_tclsh=check
+fi
+
+
+TCLSH=
+if test "$with_tclsh" != "no" ; then
+    { echo "$as_me:$LINENO: checking for tclsh" >&5
+echo $ECHO_N "checking for tclsh... $ECHO_C" >&6; }
+    if test -x "$with_tclsh/bin/tclsh"
+    then
+        echo Found tclsh in $with_tclsh/bin/tclsh
+        TCLSH="$with_tclsh/bin/tclsh"
+    else
+        if test -x "$with_tclsh"
+        then
+            echo Found tclsh in $with_tclsh
+            TCLSH="$with_tclsh"
+        else
+            # Extract the first word of "tclsh", so it can be a program name with args.
+set dummy tclsh; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_TCLSH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $TCLSH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TCLSH=$ac_cv_path_TCLSH
+if test -n "$TCLSH"; then
+  { echo "$as_me:$LINENO: result: $TCLSH" >&5
+echo "${ECHO_T}$TCLSH" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+        fi
+    fi
+fi
+{ echo "$as_me:$LINENO: result: ${TCLSH}" >&5
+echo "${ECHO_T}${TCLSH}" >&6; }
+
 
 
@@ -5486 +5579 @@
 
 
-subdirs="$subdirs gui"
-
-subdirs="$subdirs src/tcl"
-
+if test "$ENABLE_GUI" == "yes" ; then
+    subdirs="$subdirs gui"
+
+fi
+
+if test "$TCLSH" != "" ; then
+    subdirs="$subdirs src/tcl"
+
+fi
 
 ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/simsim gui/apps/rappture gui/apps/rappture.env"
@@ -6197 +6295 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
+ENABLE_GUI!$ENABLE_GUI$ac_delim
+TCLSH!$TCLSH$ac_delim
 MEX!$MEX$ac_delim
 MEX_ARCH!$MEX_ARCH$ac_delim
@@ -6215 +6315 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
     break
   elif $ac_last_try; then

trunk/configure.in

@@ -46 +46 @@
 
 
+
+AC_ARG_ENABLE(
+    [gui],
+    [AS_HELP_STRING([--enable-gui], [build code related to the graphical user interface @<:@default=yes@:>@])],
+    [],
+    [enable_gui=yes])
+
+ENABLE_GUI=
+if test "$enable_gui" != "no" ; then
+    ENABLE_GUI="yes"
+fi
+AC_SUBST(ENABLE_GUI)
 
 dnl AC_ARG_ENABLE(
@@ -55 +67 @@
 dnl BUILD_TCL=yes
 dnl AC_SUBST(BUILD_TCL)
+
+AC_ARG_WITH(
+    [tclsh],
+    [AS_HELP_STRING([--with-tclsh[=DIR]],
+        [location of tclsh @<:@default=check@:>@])],
+    [],
+    [with_tclsh=check])
+
+TCLSH=
+if test "$with_tclsh" != "no" ; then
+    AC_MSG_CHECKING([for tclsh])
+    if test -x "$with_tclsh/bin/tclsh"
+    then
+        echo Found tclsh in $with_tclsh/bin/tclsh
+        TCLSH="$with_tclsh/bin/tclsh"
+    else
+        if test -x "$with_tclsh"
+        then
+            echo Found tclsh in $with_tclsh
+            TCLSH="$with_tclsh"
+        else
+            AC_PATH_PROG(TCLSH, tclsh)
+        fi
+    fi
+fi
+AC_MSG_RESULT([${TCLSH}])
+AC_SUBST(TCLSH)
 
 
@@ -342 +381 @@
 AC_SUBST(RP_BASE)
 
-AC_CONFIG_SUBDIRS( gui )
-AC_CONFIG_SUBDIRS( src/tcl )
+if test "$ENABLE_GUI" == "yes" ; then
+    AC_CONFIG_SUBDIRS( gui )
+fi
+
+if test "$TCLSH" != "" ; then
+    AC_CONFIG_SUBDIRS( src/tcl )
+fi
 
 dnl read Makefile.in and write Makefile