Changeset 2240 for trunk/test/common_defs.sh.in

Timestamp:

Apr 11, 2010, 5:06:16 PM (12 years ago)

Author:

Peter

Message:

Required .m4 files no longer need to be set in variable
'required'. The files are not copied manually anymore but we let
aclocal do the job. Modified tests to reflect this change.

File:

• trunk/test/common_defs.sh.in (modified) (4 diffs)

trunk/test/common_defs.sh.in

@@ -35 +35 @@
 bootstrap ()
 {
-    autoreconf -siv && true
-    res=$?
-    case $res in
-  0)
-      :;;
-  63)
-      exit 77;;
-  *)
-      exit $res;;
-    esac
+    @MKDIR_P@ m4
+    autoreconf -siv && true
+    res=$?
+    case $res in
+        0)
+            :;;
+        63)
+            exit 77;;
+        *)
+            exit $res;;
+    esac
 }
 
@@ -60 +61 @@
       (echo "$me: running libtool --version" && libtool --version) || \
       (echo "$me: running glibtool --version" && glibtool --version) || exit 77
-      ;;
-      *.m4)
-      : # do nothing see below
       ;;
       *)
@@ -101 +99 @@
 echo "creating Makefile.am"
 cat > Makefile.am <<EOF
-ACLOCAL_AMFLAGS = -I m4
-# dependency to rerun configure
-CONFIG_STATUS_DEPENDENCIES = $abs_top_builddir/build_support/yat-config
+ACLOCAL_AMFLAGS = -I m4 -I ${abs_top_srcdir}/m4 --install
 AM_CPPFLAGS = \$(YAT_CPPFLAGS)
 AM_CXXFLAGS = \$(YAT_CXXFLAGS)
@@ -136 +132 @@
 fi #end of creation of autotool files
 
-if test -n "$required"; then
-  for tool in $required; do
-    case $tool in
-      *.m4)
-      @MKDIR_P@ --verbose m4
-      echo "copying $tool"
-      cp @abs_top_srcdir@/m4/$tool m4/$tool
-      ;;
-      *)
-      :
-    esac
-  done
-fi
-  
 # turn on shell traces when in verbose mode
 set -x