[cig-commits] [commit] devel: BLD: Get out-of-source builds working here. (e44b579)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem2d

On branch  : devel
Link       : https://github.com/geodynamics/specfem2d/compare/a7da6467b6d122c0472513444ce29f2e16a04648...de54f292fc495b3e612e883ea9c3ad063282a6e9

>---------------------------------------------------------------

commit e44b579a9950874f7e3f0dfa466d5b53af06d1f3
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Tue Jan 6 22:34:24 2015 -0500

    BLD: Get out-of-source builds working here.


>---------------------------------------------------------------

e44b579a9950874f7e3f0dfa466d5b53af06d1f3
 configure                                 | 30 +++++++++++++++++++++++++++---
 configure.ac                              |  6 +++++-
 src/meshfem2D/rules.mk                    |  4 ++--
 src/meshfem2D/scotch_5.1.12b/src/Makefile |  1 +
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 0e27307..745f713 100755
--- a/configure
+++ b/configure
@@ -2708,7 +2708,7 @@ FFLAGS="$FCFLAGS"
 
 
 
-flags_guess="$SHELL flags.guess"
+flags_guess="$SHELL $srcdir/flags.guess"
 { $as_echo "$as_me:${as_lineno-$LINENO}: running $flags_guess" >&5
 $as_echo "$as_me: running $flags_guess" >&6;}
 flags=`$flags_guess` ||
@@ -6358,6 +6358,13 @@ if test "$USE_BUNDLED_SCOTCH" = 1; then
 
 fi
 
+ac_config_commands="$ac_config_commands bin"
+
+ac_config_commands="$ac_config_commands obj"
+
+ac_config_commands="$ac_config_commands OUTPUT_FILES"
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -6901,6 +6908,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
 _ACEOF
 
@@ -6930,6 +6938,9 @@ $config_files
 Configuration headers:
 $config_headers
 
+Configuration commands:
+$config_commands
+
 Report bugs to <see the wiki>."
 
 _ACEOF
@@ -7062,6 +7073,9 @@ do
     "setup/constants.h") CONFIG_FILES="$CONFIG_FILES setup/constants.h" ;;
     "setup/precision.h") CONFIG_FILES="$CONFIG_FILES setup/precision.h" ;;
     "${SCOTCH_DIR}/src/Makefile.inc") CONFIG_FILES="$CONFIG_FILES ${SCOTCH_DIR}/src/Makefile.inc" ;;
+    "bin") CONFIG_COMMANDS="$CONFIG_COMMANDS bin" ;;
+    "obj") CONFIG_COMMANDS="$CONFIG_COMMANDS obj" ;;
+    "OUTPUT_FILES") CONFIG_COMMANDS="$CONFIG_COMMANDS OUTPUT_FILES" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -7075,6 +7089,7 @@ done
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -7371,7 +7386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_HEADERS"
 
 
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 do
@@ -7604,9 +7619,18 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
   fi
  ;;
 
-
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
   esac
 
+
+  case $ac_file$ac_mode in
+    "bin":C) as_dir=bin; as_fn_mkdir_p ;;
+    "obj":C) as_dir=obj; as_fn_mkdir_p ;;
+    "OUTPUT_FILES":C) as_dir=OUTPUT_FILES; as_fn_mkdir_p ;;
+
+  esac
 done # for ac_tag
 
 
diff --git a/configure.ac b/configure.ac
index d5fbd14..17d4baf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ FFLAGS="$FCFLAGS"
 AC_PROVIDE([AC_PROG_F77])
 AC_SUBST([FCENV])
 
-flags_guess="$SHELL flags.guess"
+flags_guess="$SHELL $srcdir/flags.guess"
 AC_MSG_NOTICE([running $flags_guess])
 flags=`$flags_guess` ||
     AC_MSG_ERROR([$flags_guess failed])
@@ -244,6 +244,10 @@ if test "$USE_BUNDLED_SCOTCH" = 1; then
   ])
 fi
 
+AC_CONFIG_COMMANDS([bin], [AS_MKDIR_P(bin)])
+AC_CONFIG_COMMANDS([obj], [AS_MKDIR_P(obj)])
+AC_CONFIG_COMMANDS([OUTPUT_FILES], [AS_MKDIR_P(OUTPUT_FILES)])
+
 AC_OUTPUT
 
 
diff --git a/src/meshfem2D/rules.mk b/src/meshfem2D/rules.mk
index 0ec0e8f..1ac112b 100644
--- a/src/meshfem2D/rules.mk
+++ b/src/meshfem2D/rules.mk
@@ -84,10 +84,10 @@ meshfem2D_SHARED_OBJECTS = \
 $(SCOTCH_INCLUDEDIR)/scotchf.h: scotch_library
 scotch_library:
 ifeq ($(USE_BUNDLED_SCOTCH),1)
-	echo "Using bundled Scotch"
+	@echo "Using bundled Scotch"
 	$(MAKE) -C "$(SCOTCH_DIR)/src"
 else
-	echo "Not using bundled Scotch"
+	@echo "Not using bundled Scotch"
 endif
 
 
diff --git a/src/meshfem2D/scotch_5.1.12b/src/Makefile b/src/meshfem2D/scotch_5.1.12b/src/Makefile
index 263c327..c56ee86 100644
--- a/src/meshfem2D/scotch_5.1.12b/src/Makefile
+++ b/src/meshfem2D/scotch_5.1.12b/src/Makefile
@@ -33,6 +33,7 @@
 VERSION	= 5
 RELEASE = 1
 PATCHLEVEL = 12
+export VERSION RELEASE PATCHLEVEL
 
 .PHONY				:	clean	default	install	realclean	required	scotch