Changeset 905 for trunk


Ignore:
Timestamp:
Feb 26, 2008 12:47:21 PM (16 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r833 r905  
    3737
    3838build_gui:
    39         make -C gui
     39        @if test "x@ENABLE_GUI@" == "xyes" ; then \
     40                make -C gui; \
     41        fi
    4042
    4143install_gui:
    42         make -C gui install
     44        @if test "x@ENABLE_GUI@" == "xyes" ; then \
     45                make -C gui install; \
     46        fi
    4347
    4448rplib:
     
    8286
    8387#tcl bindings
     88#cd tcl; @TCLSH@ install.tcl
    8489install_tcl:
    85         cd tcl; $(bindir)/tclsh install.tcl
    86 #       cd tcl; @TCLSH@ install.tcl
    87         make -C src/tcl install
     90        @if test "x@TCLSH@" != "x" ; then \
     91                cd tcl; $(bindir)/tclsh install.tcl; \
     92                make -C src/tcl install; \
     93        fi
    8894
    8995# matlab bindings
     
    163169
    164170distclean:
    165         rm examples/demo.bash
     171        rm -f examples/demo.bash
    166172        make -C examples/app-fermi/cee distclean
    167173        make -C examples/app-fermi/fortran distclean
     
    177183        make -C src2/core distclean
    178184        make -C test distclean
    179         rm gui/apps/rappture gui/apps/simsim gui/apps/rappture.env;
     185        rm -f gui/apps/rappture gui/apps/simsim gui/apps/rappture.env;
    180186        rm -rf Makefile config.status config.log bin;
    181187        rm -f include/*
  • trunk/configure

    r872 r905  
    675675FFLAGS
    676676ac_ct_F77
     677ENABLE_GUI
     678TCLSH
    677679MEX
    678680MEX_ARCH
     
    12751277  cat <<\_ACEOF
    12761278
     1279Optional Features:
     1280  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
     1281  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     1282  --enable-gui            build code related to the graphical user interface
     1283                          [default=yes]
     1284
    12771285Optional Packages:
    12781286  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    12791287  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
     1288  --with-tclsh=DIR        location of tclsh [default=check]
    12801289  --with-matlab=DIR       location of matlab and mex compiler [default=check]
    12811290  --with-matlab-arch=ARCH build Matlab bindings for ARCH architecture
     
    50775086
    50785087
     5088# Check whether --enable-gui was given.
     5089if test "${enable_gui+set}" = set; then
     5090  enableval=$enable_gui;
     5091else
     5092  enable_gui=yes
     5093fi
     5094
     5095
     5096ENABLE_GUI=
     5097if test "$enable_gui" != "no" ; then
     5098    ENABLE_GUI="yes"
     5099fi
     5100
     5101
     5102
     5103
     5104# Check whether --with-tclsh was given.
     5105if test "${with_tclsh+set}" = set; then
     5106  withval=$with_tclsh;
     5107else
     5108  with_tclsh=check
     5109fi
     5110
     5111
     5112TCLSH=
     5113if test "$with_tclsh" != "no" ; then
     5114    { echo "$as_me:$LINENO: checking for tclsh" >&5
     5115echo $ECHO_N "checking for tclsh... $ECHO_C" >&6; }
     5116    if test -x "$with_tclsh/bin/tclsh"
     5117    then
     5118        echo Found tclsh in $with_tclsh/bin/tclsh
     5119        TCLSH="$with_tclsh/bin/tclsh"
     5120    else
     5121        if test -x "$with_tclsh"
     5122        then
     5123            echo Found tclsh in $with_tclsh
     5124            TCLSH="$with_tclsh"
     5125        else
     5126            # Extract the first word of "tclsh", so it can be a program name with args.
     5127set dummy tclsh; ac_word=$2
     5128{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     5129echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     5130if test "${ac_cv_path_TCLSH+set}" = set; then
     5131  echo $ECHO_N "(cached) $ECHO_C" >&6
     5132else
     5133  case $TCLSH in
     5134  [\\/]* | ?:[\\/]*)
     5135  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
     5136  ;;
     5137  *)
     5138  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     5139for as_dir in $PATH
     5140do
     5141  IFS=$as_save_IFS
     5142  test -z "$as_dir" && as_dir=.
     5143  for ac_exec_ext in '' $ac_executable_extensions; do
     5144  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     5145    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
     5146    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     5147    break 2
     5148  fi
     5149done
     5150done
     5151IFS=$as_save_IFS
     5152
     5153  ;;
     5154esac
     5155fi
     5156TCLSH=$ac_cv_path_TCLSH
     5157if test -n "$TCLSH"; then
     5158  { echo "$as_me:$LINENO: result: $TCLSH" >&5
     5159echo "${ECHO_T}$TCLSH" >&6; }
     5160else
     5161  { echo "$as_me:$LINENO: result: no" >&5
     5162echo "${ECHO_T}no" >&6; }
     5163fi
     5164
     5165
     5166        fi
     5167    fi
     5168fi
     5169{ echo "$as_me:$LINENO: result: ${TCLSH}" >&5
     5170echo "${ECHO_T}${TCLSH}" >&6; }
     5171
    50795172
    50805173
     
    54865579
    54875580
    5488 subdirs="$subdirs gui"
    5489 
    5490 subdirs="$subdirs src/tcl"
    5491 
     5581if test "$ENABLE_GUI" == "yes" ; then
     5582    subdirs="$subdirs gui"
     5583
     5584fi
     5585
     5586if test "$TCLSH" != "" ; then
     5587    subdirs="$subdirs src/tcl"
     5588
     5589fi
    54925590
    54935591ac_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"
     
    61976295FFLAGS!$FFLAGS$ac_delim
    61986296ac_ct_F77!$ac_ct_F77$ac_delim
     6297ENABLE_GUI!$ENABLE_GUI$ac_delim
     6298TCLSH!$TCLSH$ac_delim
    61996299MEX!$MEX$ac_delim
    62006300MEX_ARCH!$MEX_ARCH$ac_delim
     
    62156315_ACEOF
    62166316
    6217   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     6317  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
    62186318    break
    62196319  elif $ac_last_try; then
  • trunk/configure.in

    r872 r905  
    4646
    4747
     48
     49AC_ARG_ENABLE(
     50    [gui],
     51    [AS_HELP_STRING([--enable-gui], [build code related to the graphical user interface @<:@default=yes@:>@])],
     52    [],
     53    [enable_gui=yes])
     54
     55ENABLE_GUI=
     56if test "$enable_gui" != "no" ; then
     57    ENABLE_GUI="yes"
     58fi
     59AC_SUBST(ENABLE_GUI)
    4860
    4961dnl AC_ARG_ENABLE(
     
    5567dnl BUILD_TCL=yes
    5668dnl AC_SUBST(BUILD_TCL)
     69
     70AC_ARG_WITH(
     71    [tclsh],
     72    [AS_HELP_STRING([--with-tclsh[=DIR]],
     73        [location of tclsh @<:@default=check@:>@])],
     74    [],
     75    [with_tclsh=check])
     76
     77TCLSH=
     78if test "$with_tclsh" != "no" ; then
     79    AC_MSG_CHECKING([for tclsh])
     80    if test -x "$with_tclsh/bin/tclsh"
     81    then
     82        echo Found tclsh in $with_tclsh/bin/tclsh
     83        TCLSH="$with_tclsh/bin/tclsh"
     84    else
     85        if test -x "$with_tclsh"
     86        then
     87            echo Found tclsh in $with_tclsh
     88            TCLSH="$with_tclsh"
     89        else
     90            AC_PATH_PROG(TCLSH, tclsh)
     91        fi
     92    fi
     93fi
     94AC_MSG_RESULT([${TCLSH}])
     95AC_SUBST(TCLSH)
    5796
    5897
     
    342381AC_SUBST(RP_BASE)
    343382
    344 AC_CONFIG_SUBDIRS( gui )
    345 AC_CONFIG_SUBDIRS( src/tcl )
     383if test "$ENABLE_GUI" == "yes" ; then
     384    AC_CONFIG_SUBDIRS( gui )
     385fi
     386
     387if test "$TCLSH" != "" ; then
     388    AC_CONFIG_SUBDIRS( src/tcl )
     389fi
    346390
    347391dnl read Makefile.in and write Makefile
Note: See TracChangeset for help on using the changeset viewer.