From d34faa85da0ded895b66977138c5b6c5984c8a09 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Wed, 21 Feb 2001 14:56:14 +0000 Subject: [PATCH] exterior form renamed git-svn-id: https://svn.dealii.org/trunk@4001 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/Makefile.in | 14 ++++- deal.II/contrib/configure | 118 ++++++++++++++++++++++++++++++++++- deal.II/contrib/configure.in | 2 +- 3 files changed, 129 insertions(+), 5 deletions(-) diff --git a/deal.II/contrib/Makefile.in b/deal.II/contrib/Makefile.in index 9fa5eb3e2b..393b11ab3a 100644 --- a/deal.II/contrib/Makefile.in +++ b/deal.II/contrib/Makefile.in @@ -1,6 +1,8 @@ # $Id$ # Makefile for the /contrib subdirectory +include ../common/Make.global_options + # by default make sublibs default: hsl @@ -13,13 +15,19 @@ kdoc-install: kdoc-clean: cd kdoc ; $(MAKE) clean +ifeq ($(USE_CONTRIB_HSL),yes) hsl: cd hsl ; $(MAKE) - -# generic targets -clean: kdoc-clean +hsl-clean: cd hsl ; $(MAKE) clean +else +hsl: +hsl-clean: +endif + +# generic targets +clean: kdoc-clean hsl-clean .PHONY: default kdoc-install kdoc-clean hsl clean diff --git a/deal.II/contrib/configure b/deal.II/contrib/configure index 2b6de69f2f..0de1853471 100755 --- a/deal.II/contrib/configure +++ b/deal.II/contrib/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.1 +# From configure.in Revision: 1.3 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -526,6 +526,28 @@ cd kdoc/src cd $DEAL2_CONTRIB_DIR +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +subdirs="hsl" + + trap '' 1 2 15 @@ -626,6 +648,7 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@subdirs@%$subdirs%g CEOF EOF @@ -733,3 +756,96 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + for ac_config_dir in hsl; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi + diff --git a/deal.II/contrib/configure.in b/deal.II/contrib/configure.in index 4e93042c34..b365bc53e6 100644 --- a/deal.II/contrib/configure.in +++ b/deal.II/contrib/configure.in @@ -28,7 +28,7 @@ cd $DEAL2_CONTRIB_DIR dnl Configure the HSL subdir -AC_CONIG_SUBDIRS(hsl) +AC_CONFIG_SUBDIRS(hsl) dnl ------------------------------------------------------------- -- 2.39.5