Changeset 512 for trunk


Ignore:
Timestamp:
Aug 21, 2006, 12:25:25 AM (18 years ago)
Author:
dkearney
Message:

made changes to the build system for the rappture package and added a few automake necessary files. also demo.bash was added to the list of files tha
t are automatically generated.

Location:
trunk
Files:
3 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r511 r512  
     1
     2build_date := $(shell date +%Y%m%d)
     3machine := $(shell uname -m)
     4os := $(shell uname -s)
     5bn := $(shell basename @prefix@)
     6TarfileBasename=rappture-$(os)-$(machine)-$(build_date)
     7
    18all: rplib build_bindings
    29install: rp_gui install_rplib install_bindings install_examples
    … …  
    1118#############################################################################
    1219
     20
    1321rp_gui:
    1422        set -x;
    1523        cd gui; \
    16         make clean; make distclean; \
    17         ./configure --prefix=@prefix@ --with-blt=@prefix@/include; \
    1824        make all; \
    1925        make install;
    2026
     27#       ./configure --prefix=@prefix@ --with-blt=@prefix@/include; \
    2128#       make all >& $(basedir)/output.gui 2>&1; \
    2229#       make install >> $(basedir)/output.gui 2>&1
    … …  
    7885                build_ext \
    7986                --library-dirs=@prefix@/lib \
    80                 --include-dirs=@prefix@/include/core \
     87                --include-dirs=@prefix@/include \
    8188                build
    8289
    … …  
    96103        cd perl; make install;
    97104
     105build_pkgs:
     106        set -x;
     107        make distclean
     108        if ! test -d "bin"; then \
     109                mkdir bin;\
     110        fi
     111        # building rappture binary package
     112        cd @prefix@/..; tar czf @RP_BASE@/bin/$(TarfileBasename).tar.gz $(bn)
     113
    98114clean:
    99115        cd examples/app-fermi/cee; make clean; cd -;
    100116        cd examples/app-fermi/fortran; make clean; cd -;
    101117        cd examples/c-example; make clean; cd -;
     118        cd gui; make clean; cd -;
    102119        cd perl; make clean; cd -;
    103120        cd python; rm -rf build; rm setup.py; cd -;
    … …  
    107124
    108125distclean:
     126        cd examples; rm demo.bash
    109127        cd examples/app-fermi/cee; make distclean; cd -;
    110128        cd examples/app-fermi/fortran; make distclean; cd -;
    111129        cd examples/c-example; make distclean; cd -;
     130        cd gui; make distclean; cd -;
    112131        cd perl; make clean; cd -;
    113132        cd python; rm -rf build; rm setup.py; cd -;
    … …  
    117136        cd test; make distclean; cd -;
    118137        rm gui/apps/rappture;
    119         rm -r Makefile config.status config.log;
     138        rm -rf Makefile config.status config.log bin;

  • trunk/configure

    r498 r512  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59.
     3# Generated by GNU Autoconf 2.59 for rappture 1.1.
     4#
     5# Report bugs to <rappture@nanohub.org>.
    46#
    57# Copyright (C) 2003 Free Software Foundation, Inc.
    … …  
    266268
    267269# Identity of this package.
    268 PACKAGE_NAME=
    269 PACKAGE_TARNAME=
    270 PACKAGE_VERSION=
    271 PACKAGE_STRING=
    272 PACKAGE_BUGREPORT=
    273 
    274 ac_unique_file="src/core/RpLibrary.cc"
     270PACKAGE_NAME='rappture'
     271PACKAGE_TARNAME='rappture'
     272PACKAGE_VERSION='1.1'
     273PACKAGE_STRING='rappture 1.1'
     274PACKAGE_BUGREPORT='rappture@nanohub.org'
     275
    275276# Factoring default headers for most tests.
    276277ac_includes_default="\
    … …  
    310311#endif"
    311312
    312 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 MEX MKOCTFILE PERL PYTHON pythondir PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES VERSION RP_BASE LIBOBJS LTLIBOBJS'
     313ac_subdirs_all="$ac_subdirs_all gui"
     314ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 MEX MKOCTFILE PERL PYTHON pythondir PERL_INCLUDES PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES VERSION RP_BASE subdirs LIBOBJS LTLIBOBJS'
    313315ac_subst_files=''
    314316
    … …  
    799801  # This message is too long to be a string in the A/UX 3.1 sh.
    800802  cat <<_ACEOF
    801 \`configure' configures this package to adapt to many kinds of systems.
     803\`configure' configures rappture 1.1 to adapt to many kinds of systems.
    802804
    803805Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    855857
    856858if test -n "$ac_init_help"; then
    857 
     859  case $ac_init_help in
     860     short | recursive ) echo "Configuration of rappture 1.1:";;
     861   esac
    858862  cat <<\_ACEOF
    859863
    … …  
    883887it to find libraries and programs with nonstandard names/locations.
    884888
     889Report bugs to <rappture@nanohub.org>.
    885890_ACEOF
    886891fi
    … …  
    978983if $ac_init_version; then
    979984  cat <<\_ACEOF
     985rappture configure 1.1
     986generated by GNU Autoconf 2.59
    980987
    981988Copyright (C) 2003 Free Software Foundation, Inc.
    … …  
    990997running configure, to aid debugging if configure makes a mistake.
    991998
    992 It was created by $as_me, which was
     999It was created by rappture $as_me 1.1, which was
    9931000generated by GNU Autoconf 2.59.  Invocation command line was
    9941001
    … …  
    13191326
    13201327
     1328
     1329
     1330
     1331
     1332
     1333
     1334
     1335
    13211336VERSION=0.0.1
    13221337
    … …  
    36613676    (
    36623677      cat <<\_ASBOX
    3663 ## ------------------------------------------ ##
    3664 ## Report this to the AC_PACKAGE_NAME lists. ##
    3665 ## ------------------------------------------ ##
     3678## ----------------------------------- ##
     3679## Report this to rappture@nanohub.org ##
     3680## ----------------------------------- ##
    36663681_ASBOX
    36673682    ) |
    … …  
    38133828    (
    38143829      cat <<\_ASBOX
    3815 ## ------------------------------------------ ##
    3816 ## Report this to the AC_PACKAGE_NAME lists. ##
    3817 ## ------------------------------------------ ##
     3830## ----------------------------------- ##
     3831## Report this to rappture@nanohub.org ##
     3832## ----------------------------------- ##
    38183833_ASBOX
    38193834    ) |
    … …  
    39653980    (
    39663981      cat <<\_ASBOX
    3967 ## ------------------------------------------ ##
    3968 ## Report this to the AC_PACKAGE_NAME lists. ##
    3969 ## ------------------------------------------ ##
     3982## ----------------------------------- ##
     3983## Report this to rappture@nanohub.org ##
     3984## ----------------------------------- ##
    39703985_ASBOX
    39713986    ) |
    … …  
    41174132    (
    41184133      cat <<\_ASBOX
    4119 ## ------------------------------------------ ##
    4120 ## Report this to the AC_PACKAGE_NAME lists. ##
    4121 ## ------------------------------------------ ##
     4134## ----------------------------------- ##
     4135## Report this to rappture@nanohub.org ##
     4136## ----------------------------------- ##
    41224137_ASBOX
    41234138    ) |
    … …  
    42414256
    42424257# Provide some information about the compiler.
    4243 echo "$as_me:4243:" \
     4258echo "$as_me:4258:" \
    42444259     "checking for Fortran 77 compiler version" >&5
    42454260ac_compiler=`set X $ac_compile; echo $2`
    … …  
    43904405
    43914406fi;
     4407MEX=
    43924408if test "$with_matlab" != "no" ; then
    4393     if test -x "$with_matlab/bin/mex"
     4409        if test -x "$with_matlab/bin/mex"
    43944410    then
    43954411        echo Found matlab in $with_matlab/bin/mex
    … …  
    44454461
    44464462
    4447 
    44484463# Check whether --with-octave or --without-octave was given.
    44494464if test "${with_octave+set}" = set; then
    … …  
    44514466
    44524467fi;
     4468MKOCTFILE=
    44534469if test "$with_octave" != "no" ; then
    44544470    if test -x "$with_octave/bin/mkoctfile"
    … …  
    45134529
    45144530fi;
     4531PERL=
     4532PERL_INCLUDES=
    45154533if test "$with_perl" != "no" ; then
    45164534    if test -x "$with_perl/bin/perl"
    … …  
    46344652    then
    46354653        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[0:3]"`
    4636     echo Found Python version $PYTHON_VERSION
     4654        echo Using python version $PYTHON_VERSION
    46374655    fi
    46384656    if test "$PYTHON_VERSION" != ""
    … …  
    46824700
    46834701
     4702
     4703
     4704
    46844705RP_BASE=`pwd`
    46854706
    46864707
    4687                                                                                                               ac_config_files="$ac_config_files Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile test/Makefile gui/apps/rappture"
     4708ac_aux_dir=
     4709for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
     4710  if test -f $ac_dir/install-sh; then
     4711    ac_aux_dir=$ac_dir
     4712    ac_install_sh="$ac_aux_dir/install-sh -c"
     4713    break
     4714  elif test -f $ac_dir/install.sh; then
     4715    ac_aux_dir=$ac_dir
     4716    ac_install_sh="$ac_aux_dir/install.sh -c"
     4717    break
     4718  elif test -f $ac_dir/shtool; then
     4719    ac_aux_dir=$ac_dir
     4720    ac_install_sh="$ac_aux_dir/shtool install -c"
     4721    break
     4722  fi
     4723done
     4724if test -z "$ac_aux_dir"; then
     4725  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     4726echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
     4727   { (exit 1); exit 1; }; }
     4728fi
     4729ac_config_guess="$SHELL $ac_aux_dir/config.guess"
     4730ac_config_sub="$SHELL $ac_aux_dir/config.sub"
     4731ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
     4732
     4733
     4734
     4735subdirs="$subdirs gui "
     4736
     4737
     4738                                                                                                                        ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile test/Makefile gui/apps/rappture"
    46884739cat >confcache <<\_ACEOF
    46894740# This file is a shell script that caches the results of configure
    … …  
    50795130cat >&5 <<_CSEOF
    50805131
    5081 This file was extended by $as_me, which was
     5132This file was extended by rappture $as_me 1.1, which was
    50825133generated by GNU Autoconf 2.59.  Invocation command line was
    50835134
    … …  
    51345185cat >>$CONFIG_STATUS <<_ACEOF
    51355186ac_cs_version="\\
    5136 config.status
     5187rappture config.status 1.1
    51375188configured by $0, generated by GNU Autoconf 2.59,
    51385189  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
    … …  
    52375288  # Handling of arguments.
    52385289  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     5290  "examples/demo.bash" ) CONFIG_FILES="$CONFIG_FILES examples/demo.bash" ;;
    52395291  "examples/app-fermi/cee/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/app-fermi/cee/Makefile" ;;
    52405292  "examples/app-fermi/fortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/app-fermi/fortran/Makefile" ;;
    … …  
    53525404s,@PYTHON@,$PYTHON,;t t
    53535405s,@pythondir@,$pythondir,;t t
     5406s,@PERL_INCLUDES@,$PERL_INCLUDES,;t t
    53545407s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
    53555408s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t
    … …  
    53575410s,@VERSION@,$VERSION,;t t
    53585411s,@RP_BASE@,$RP_BASE,;t t
     5412s,@subdirs@,$subdirs,;t t
    53595413s,@LIBOBJS@,$LIBOBJS,;t t
    53605414s,@LTLIBOBJS@,$LTLIBOBJS,;t t
    … …  
    56235677fi
    56245678
     5679#
     5680# CONFIG_SUBDIRS section.
     5681#
     5682if test "$no_recursion" != yes; then
     5683
     5684  # Remove --cache-file and --srcdir arguments so they do not pile up.
     5685  ac_sub_configure_args=
     5686  ac_prev=
     5687  for ac_arg in $ac_configure_args; do
     5688    if test -n "$ac_prev"; then
     5689      ac_prev=
     5690      continue
     5691    fi
     5692    case $ac_arg in
     5693    -cache-file | --cache-file | --cache-fil | --cache-fi \
     5694    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     5695      ac_prev=cache_file ;;
     5696    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
     5697    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
     5698    | --c=*)
     5699      ;;
     5700    --config-cache | -C)
     5701      ;;
     5702    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     5703      ac_prev=srcdir ;;
     5704    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     5705      ;;
     5706    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     5707      ac_prev=prefix ;;
     5708    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
     5709      ;;
     5710    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     5711    esac
     5712  done
     5713
     5714  # Always prepend --prefix to ensure using the same prefix
     5715  # in subdir configurations.
     5716  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
     5717
     5718  ac_popdir=`pwd`
     5719  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
     5720
     5721    # Do not complain, so a configure script can configure whichever
     5722    # parts of a large source tree are present.
     5723    test -d $srcdir/$ac_dir || continue
     5724
     5725    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
     5726echo "$as_me: configuring in $ac_dir" >&6;}
     5727    { if $as_mkdir_p; then
     5728    mkdir -p "$ac_dir"
     5729  else
     5730    as_dir="$ac_dir"
     5731    as_dirs=
     5732    while test ! -d "$as_dir"; do
     5733      as_dirs="$as_dir $as_dirs"
     5734      as_dir=`(dirname "$as_dir") 2>/dev/null ||
     5735$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     5736         X"$as_dir" : 'X\(//\)[^/]' \| \
     5737         X"$as_dir" : 'X\(//\)$' \| \
     5738         X"$as_dir" : 'X\(/\)' \| \
     5739         .     : '\(.\)' 2>/dev/null ||
     5740echo X"$as_dir" |
     5741    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     5742          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     5743          /^X\(\/\/\)$/{ s//\1/; q; }
     5744          /^X\(\/\).*/{ s//\1/; q; }
     5745          s/.*/./; q'`
     5746    done
     5747    test ! -n "$as_dirs" || mkdir $as_dirs
     5748  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
     5749echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
     5750   { (exit 1); exit 1; }; }; }
     5751
     5752    ac_builddir=.
     5753
     5754if test "$ac_dir" != .; then
     5755  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
     5756  # A "../" for each directory in $ac_dir_suffix.
     5757  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
     5758else
     5759  ac_dir_suffix= ac_top_builddir=
     5760fi
     5761
     5762case $srcdir in
     5763  .)  # No --srcdir option.  We are building in place.
     5764    ac_srcdir=.
     5765    if test -z "$ac_top_builddir"; then
     5766       ac_top_srcdir=.
     5767    else
     5768       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
     5769    fi ;;
     5770  [\\/]* | ?:[\\/]* )  # Absolute path.
     5771    ac_srcdir=$srcdir$ac_dir_suffix;
     5772    ac_top_srcdir=$srcdir ;;
     5773  *) # Relative path.
     5774    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     5775    ac_top_srcdir=$ac_top_builddir$srcdir ;;
     5776esac
     5777
     5778# Do not use `cd foo && pwd` to compute absolute paths, because
     5779# the directories may not exist.
     5780case `pwd` in
     5781.) ac_abs_builddir="$ac_dir";;
     5782*)
     5783  case "$ac_dir" in
     5784  .) ac_abs_builddir=`pwd`;;
     5785  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
     5786  *) ac_abs_builddir=`pwd`/"$ac_dir";;
     5787  esac;;
     5788esac
     5789case $ac_abs_builddir in
     5790.) ac_abs_top_builddir=${ac_top_builddir}.;;
     5791*)
     5792  case ${ac_top_builddir}. in
     5793  .) ac_abs_top_builddir=$ac_abs_builddir;;
     5794  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
     5795  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
     5796  esac;;
     5797esac
     5798case $ac_abs_builddir in
     5799.) ac_abs_srcdir=$ac_srcdir;;
     5800*)
     5801  case $ac_srcdir in
     5802  .) ac_abs_srcdir=$ac_abs_builddir;;
     5803  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
     5804  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
     5805  esac;;
     5806esac
     5807case $ac_abs_builddir in
     5808.) ac_abs_top_srcdir=$ac_top_srcdir;;
     5809*)
     5810  case $ac_top_srcdir in
     5811  .) ac_abs_top_srcdir=$ac_abs_builddir;;
     5812  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
     5813  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
     5814  esac;;
     5815esac
     5816
     5817
     5818    cd $ac_dir
     5819
     5820    # Check for guested configure; otherwise get Cygnus style configure.
     5821    if test -f $ac_srcdir/configure.gnu; then
     5822      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
     5823    elif test -f $ac_srcdir/configure; then
     5824      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
     5825    elif test -f $ac_srcdir/configure.in; then
     5826      ac_sub_configure=$ac_configure
     5827    else
     5828      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
     5829echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
     5830      ac_sub_configure=
     5831    fi
     5832
     5833    # The recursion is here.
     5834    if test -n "$ac_sub_configure"; then
     5835      # Make the cache file name correct relative to the subdirectory.
     5836      case $cache_file in
     5837      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
     5838      *) # Relative path.
     5839        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
     5840      esac
     5841
     5842      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
     5843echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
     5844      # The eval makes quoting arguments work.
     5845      eval $ac_sub_configure $ac_sub_configure_args \
     5846           --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
     5847        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
     5848echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
     5849   { (exit 1); exit 1; }; }
     5850    fi
     5851
     5852    cd "$ac_popdir"
     5853  done
     5854fi
     5855

  • trunk/configure.in

    r508 r512  
    1 AC_INIT(src/core/RpLibrary.cc)
    2 AM_INIT_AUTOMAKE(rappture, 1.1)
     1AC_INIT(rappture, 1.1, rappture@nanohub.org)
    32
    43VERSION=0.0.1
    … …  
    4039MEX=
    4140if test "$with_matlab" != "no" ; then
    42     WITH_MATLAB = "yes"
     41    dnl WITH_MATLAB = "yes"
    4342    if test -x "$with_matlab/bin/mex"
    4443    then
    … …  
    5554    fi
    5655fi
    57 AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
     56dnl AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
    5857
    5958AC_ARG_WITH(octave, [  --with-octave[=DIR]         Build Octave bindings if MKOCTFILE compiler is found])
    … …  
    7574    fi
    7675fi
    77 AM_CONDITIONAL(WITH_OCTAVE, test x$MKOCTFILE != x)
     76dnl AM_CONDITIONAL(WITH_OCTAVE, test x$MKOCTFILE != x)
    7877
    7978
    … …  
    104103    fi
    105104fi
    106 AM_CONDITIONAL(WITH_PERL, test x$PERL != x)
     105dnl AM_CONDITIONAL(WITH_PERL, test x$PERL != x)
    107106
    108107dnl
    … …  
    169168    fi
    170169fi
    171 AM_CONDITIONAL(WITH_PYTHON, test x$PYTHON != x)
     170dnl AM_CONDITIONAL(WITH_PYTHON, test x$PYTHON != x)
     171
    172172dnl AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
    173173dnl if test "$PYTHON_INCLUDES" != ""
    … …  
    177177dnl     PYTHON_SUBDIR=
    178178dnl fi
     179
    179180AC_SUBST(pythondir)
    180181dnl AC_SUBST(PYTHON_SUBDIR)
    … …  
    194195AC_SUBST(RP_BASE)
    195196
     197AC_CONFIG_SUBDIRS( gui )
     198
    196199dnl read Makefile.in and write Makefile
    197200AC_OUTPUT(  Makefile \
     201            examples/demo.bash
    198202            examples/app-fermi/cee/Makefile \
    199203            examples/app-fermi/fortran/Makefile \

  • trunk/examples/demo.bash.in

    r511 r512  
    77#
    88
    9 rpdir=/opt/rappture
     9rpdir=@prefix@
    1010
    1111exdir=$rpdir/examples
Note: See TracChangeset for help on using the changeset viewer.