Changeset 2240


Ignore:
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.

Location:
trunk/test
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/common_defs.sh.in

    r2228 r2240  
    3535bootstrap ()
    3636{
    37     autoreconf -siv && true
    38     res=$?
    39     case $res in
    40   0)
    41       :;;
    42   63)
    43       exit 77;;
    44   *)
    45       exit $res;;
    46     esac
     37    @MKDIR_P@ m4
     38    autoreconf -siv && true
     39    res=$?
     40    case $res in
     41        0)
     42            :;;
     43        63)
     44            exit 77;;
     45        *)
     46            exit $res;;
     47    esac
    4748}
    4849
     
    6061      (echo "$me: running libtool --version" && libtool --version) || \
    6162      (echo "$me: running glibtool --version" && glibtool --version) || exit 77
    62       ;;
    63       *.m4)
    64       : # do nothing see below
    6563      ;;
    6664      *)
     
    10199echo "creating Makefile.am"
    102100cat > Makefile.am <<EOF
    103 ACLOCAL_AMFLAGS = -I m4
    104 # dependency to rerun configure
    105 CONFIG_STATUS_DEPENDENCIES = $abs_top_builddir/build_support/yat-config
     101ACLOCAL_AMFLAGS = -I m4 -I ${abs_top_srcdir}/m4 --install
    106102AM_CPPFLAGS = \$(YAT_CPPFLAGS)
    107103AM_CXXFLAGS = \$(YAT_CXXFLAGS)
     
    136132fi #end of creation of autotool files
    137133
    138 if test -n "$required"; then
    139   for tool in $required; do
    140     case $tool in
    141       *.m4)
    142       @MKDIR_P@ --verbose m4
    143       echo "copying $tool"
    144       cp @abs_top_srcdir@/m4/$tool m4/$tool
    145       ;;
    146       *)
    147       :
    148     esac
    149   done
    150 fi
    151  
    152134# turn on shell traces when in verbose mode
    153135set -x
  • trunk/test/static_test.sh

    r2225 r2240  
    2222# test that it works to link statically against libyat
    2323
    24 required="autoconf automake libtool yat.m4"
     24required="autoconf automake libtool"
    2525
    2626set -e
  • trunk/test/yat_cpp_add_flag_test.sh

    r2225 r2240  
    2323# includes like `-I/usr/include' and `-I/usr/local/include'
    2424
    25 required="autoconf automake g++ yat_add_flag.m4 ax_cxxcpp_check_flag.m4"
     25required="autoconf automake g++"
    2626
    2727set -e
  • trunk/test/yat_cxx_add_flag_test.sh

    r2225 r2240  
    2323# is already present
    2424
    25 required="autoconf automake g++ yat_add_flag.m4 ax_cxx_check_flag.m4"
     25required="autoconf automake g++"
    2626
    2727set -e
  • trunk/test/yat_ld_add_flag_test.sh

    r2225 r2240  
    2323# includes like `-L/usr/lib' and `-L/usr/local/lib'
    2424
    25 required="autoconf automake g++ yat_add_flag.m4 ax_ld_check_flag.m4"
     25required="autoconf automake g++"
    2626
    2727set -e
  • trunk/test/yat_m4_test.sh

    r2225 r2240  
    2323# configure.ac. Test if the macro works against an uninstalled yat.
    2424
    25 required="autoconf automake libtool yat.m4"
     25required="autoconf automake libtool"
    2626
    2727set -e
  • trunk/test/yat_m4_test2.sh

    r2225 r2240  
    2222# test that option --with-yat=no works as expected.
    2323
    24 required="autoconf automake yat.m4"
     24required="autoconf automake"
    2525
    2626set -e
Note: See TracChangeset for help on using the changeset viewer.