Changeset 2271


Ignore:
Timestamp:
Jun 14, 2010, 6:57:06 AM (13 years ago)
Author:
Peter
Message:

backporting r2266 to stable branch. Use echo instead of variable ECHO provided by libtool because it's broken with 2.2.8

Location:
branches/0.6-stable
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/0.6-stable/build_support/Makefile.am

    r2161 r2271  
    5353  -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
    5454  -e 's|@PACKAGE_URL[@]|$(PACKAGE_URL)|g' \
    55   -e 's|@ECHO[@]|$(ECHO)|g' \
    5655  -e 's|@VERSION[@]|$(VERSION)|g' \
    5756  -e 's|@YAT_MAJOR_VERSION[@]|$(YAT_MAJOR_VERSION)|g' \
    … …  
    6766yat-config: Makefile $(srcdir)/yat-config.in
    6867  @rm -f $@ $@.tmp
    69   @$(ECHO) "#! $(SHELL)" > $@.tmp
    70   @$(ECHO) "# $@ generated by make from yat-config.in" >> $@.tmp
     68  @echo "#! $(SHELL)" > $@.tmp
     69  @echo "# $@ generated by make from yat-config.in" >> $@.tmp
    7170  @$(edit) '$(srcdir)/$@.in' >>$@.tmp
    7271  @chmod +x $@.tmp
    7372  @chmod a-w $@.tmp
    7473  @mv $@.tmp $@
    75   @$(ECHO) creating $@
     74  @echo creating $@
    7675
    7776yat.pc: Makefile $(srcdir)/yat.pc.in
    7877  @rm -f $@ $@.tmp
    79   @$(ECHO) "# $@ generated by make from yat.pc.in" > $@.tmp
     78  @echo "# $@ generated by make from yat.pc.in" > $@.tmp
    8079  @$(edit) '$(srcdir)/$@.in' >>$@.tmp
    8180  @chmod a-w $@.tmp
    8281  @mv $@.tmp $@
    83   @$(ECHO) creating $@
     82  @echo creating $@
    8483
    8584install-exec-hook:

  • branches/0.6-stable/build_support/yat-config.in

    r2207 r2271  
    9393    case "$1" in
    9494    --prefix)
    95     @ECHO@ $prefix
     95    echo $prefix
    9696    exit 0
    9797    ;;
    9898    --bindir)
    99     @ECHO@ $bindir
     99    echo $bindir
    100100    exit 0
    101101    ;;
    102102    --includedir)
    103     @ECHO@ $includedir
     103    echo $includedir
    104104    exit 0
    105105    ;;
    106106    --libdir)
    107     @ECHO@ $libdir
     107    echo $libdir
    108108    exit 0
    109109    ;;
    110110    --cxx)
    111     @ECHO@ $CXX
     111    echo $CXX
    112112    exit 0
    113113    ;;
    114114    --cxxcpp)
    115     @ECHO@ $CXXCPP
     115    echo $CXXCPP
    116116    exit 0
    117117    ;;
    … …  
    165165    ;;
    166166    --atleast-version=*)
    167       optarg=`@ECHO@ "$1" | sed 's/--atleast-version=//'`
    168       min_major=`@ECHO@ "$optarg" | sed 's/\([0-9]*\).*/\1/'`
     167      optarg=`echo "$1" | sed 's/--atleast-version=//'`
     168      min_major=`echo "$optarg" | sed 's/\([0-9]*\).*/\1/'`
    169169      if test "$optarg" = "$min_major"; then
    170170         min_minor="0";
    171171      else
    172          min_minor=`@ECHO@ "$optarg" | sed 's/[0-9]*.\([0-9]*\).*/\1/'`
     172         min_minor=`echo "$optarg" | sed 's/[0-9]*.\([0-9]*\).*/\1/'`
    173173      fi
    174174      if test "$optarg" = "$min_major.$min_minor"; then
    175175         min_patch="0";
    176176      else
    177          min_patch=`@ECHO@ "$optarg" | sed 's/[0-9]*.[0-9]*.\([0-9]*\).*/\1/'`
     177         min_patch=`echo "$optarg" | sed 's/[0-9]*.[0-9]*.\([0-9]*\).*/\1/'`
    178178      fi
    179179      if test "$optarg" = "$min_patch"; then
    … …  
    198198    ;;
    199199    --version)
    200     @ECHO@ @VERSION@
     200    echo @VERSION@
    201201    exit 0
    202202    ;;
    203203    --version-major)
    204     @ECHO@ @YAT_MAJOR_VERSION@
     204    echo @YAT_MAJOR_VERSION@
    205205    exit 0
    206206    ;;
    207207    --version-minor)
    208     @ECHO@ @YAT_MINOR_VERSION@
     208    echo @YAT_MINOR_VERSION@
    209209    exit 0
    210210    ;;
    211211    --version-patch)
    212     @ECHO@ @YAT_PATCH_VERSION@
     212    echo @YAT_PATCH_VERSION@
    213213    exit 0
    214214    ;;
    … …  
    243243     fi
    244244   done
    245    @ECHO@ $unique_flags
     245   echo $unique_flags
    246246fi
    247247

  • branches/0.6-stable/configure.ac

    r2161 r2271  
    8181AC_PROG_SED
    8282AC_PROG_LIBTOOL
    83 # fall back to echo unless ECHO not already set (by libtool)
    84 AS_IF([test "x$ECHO" = x], [ECHO=echo])
    85 AC_SUBST(ECHO)
    8683
    8784AC_MSG_NOTICE(dnl

  • branches/0.6-stable/doc/Makefile.am

    r2119 r2271  
    7979
    8080$(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
    81   @(cat doxygen.config && $(ECHO) "INPUT = $(DOXYGEN_INPUT)" && \
    82   $(ECHO) GENERATE_HTML = YES) | $(DOXYGEN) -;
     81  @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
     82  echo GENERATE_HTML = YES) | $(DOXYGEN) -;
    8383
    8484$(DX_LATEX_OUTPUT)/refman.tex: $(DOXYGEN_DEPS)
    85   @(cat doxygen.config && $(ECHO) "INPUT = $(DOXYGEN_INPUT)" && \
    86   $(ECHO) GENERATE_LATEX = YES) | $(DOXYGEN) -;
     85  @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
     86  echo GENERATE_LATEX = YES) | $(DOXYGEN) -;
    8787
    8888$(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
    … …  
    132132    test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\
    133133    $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \
    134     $(ECHO) "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
     134    echo "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
    135135  fi
    136136
    … …  
    139139    test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\
    140140    $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \
    141     $(ECHO) "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
     141    echo "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
    142142  fi
    143143
    … …  
    146146    test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\
    147147    $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \
    148     $(ECHO) "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
     148    echo "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
    149149  fi
    150150

  • branches/0.6-stable/yat/utility/utility.h

    r2119 r2271  
    262262        continue;
    263263      matrix.resize(matrix.size()+1);
    264       std::vector<double>& v=matrix.back();
     264      std::vector<T>& v=matrix.back();
    265265      v.reserve(nof_columns);
    266266      std::stringstream ss(line);
Note: See TracChangeset for help on using the changeset viewer.