Changeset 793


Ignore:
Timestamp:
Jun 3, 2006 2:47:31 AM (14 years ago)
Author:
andreasw
Message:

improved check for correct version of autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r787 r793  
    18311831  rm -f confauto.out
    18321832
     1833  # Check if the executable autoconf is picked up from the correct location
     1834  echo "$as_me:$LINENO: checking whether autoconf is coming from the correct location" >&5
     1835echo $ECHO_N "checking whether autoconf is coming from the correct location... $ECHO_C" >&6
     1836  autoconf_dir=`which autoconf | sed -e 's=/autoconf=='`
     1837  autoconf_dir=`cd $autoconf_dir; pwd`
     1838  if test x$AUTOTOOLS_DIR = x; then
     1839    want_dir=$HOME/bin
     1840  else
     1841    want_dir=$AUTOTOOLS_DIR/bin
     1842  fi
     1843  if test $autoconf_dir = `cd $want_dir; pwd`; then
     1844    echo "$as_me:$LINENO: result: yes" >&5
     1845echo "${ECHO_T}yes" >&6
     1846  else
     1847    rm -f confauto.out
     1848    echo "$as_me:$LINENO: result: no" >&5
     1849echo "${ECHO_T}no" >&6
     1850    { { echo "$as_me:$LINENO: error: The autoconf executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&5
     1851echo "$as_me: error: The autoconf executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&2;}
     1852   { (exit 1); exit 1; }; }
     1853  fi
     1854
    18331855  # Check if we have automake
    18341856  # Extract the first word of "automake", so it can be a program name with args.
     
    18931915  rm -f confauto.out
    18941916
     1917  # Check if the executable automake is picked up from the correct location
     1918  echo "$as_me:$LINENO: checking whether automake is coming from the correct location" >&5
     1919echo $ECHO_N "checking whether automake is coming from the correct location... $ECHO_C" >&6
     1920  automake_dir=`which automake | sed -e 's=/automake=='`
     1921  automake_dir=`cd $automake_dir; pwd`
     1922  if test x$AUTOTOOLS_DIR = x; then
     1923    want_dir=$HOME/bin
     1924  else
     1925    want_dir=$AUTOTOOLS_DIR/bin
     1926  fi
     1927  if test $automake_dir = `cd $want_dir; pwd`; then
     1928    echo "$as_me:$LINENO: result: yes" >&5
     1929echo "${ECHO_T}yes" >&6
     1930  else
     1931    rm -f confauto.out
     1932    echo "$as_me:$LINENO: result: no" >&5
     1933echo "${ECHO_T}no" >&6
     1934    { { echo "$as_me:$LINENO: error: The automake executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&5
     1935echo "$as_me: error: The automake executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&2;}
     1936   { (exit 1); exit 1; }; }
     1937  fi
     1938
    18951939  # Check if we can find the libtool file
    1896   if test "${LIBTOOLPREFIX:+set}" != set; then
    1897     for p in $HOME ; do
    1898       as_ac_File=`echo "ac_cv_file_$p/share/aclocal/libtool.m4" | $as_tr_sh`
    1899 echo "$as_me:$LINENO: checking for $p/share/aclocal/libtool.m4" >&5
    1900 echo $ECHO_N "checking for $p/share/aclocal/libtool.m4... $ECHO_C" >&6
     1940  if test x$AUTOTOOLS_DIR = x; then
     1941    want_dir=$HOME/share
     1942  else
     1943    want_dir=$AUTOTOOLS_DIR/share
     1944  fi
     1945  as_ac_File=`echo "ac_cv_file_$want_dir/aclocal/libtool.m4" | $as_tr_sh`
     1946echo "$as_me:$LINENO: checking for $want_dir/aclocal/libtool.m4" >&5
     1947echo $ECHO_N "checking for $want_dir/aclocal/libtool.m4... $ECHO_C" >&6
    19011948if eval "test \"\${$as_ac_File+set}\" = set"; then
    19021949  echo $ECHO_N "(cached) $ECHO_C" >&6
     
    19061953echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    19071954   { (exit 1); exit 1; }; }
    1908 if test -r "$p/share/aclocal/libtool.m4"; then
     1955if test -r "$want_dir/aclocal/libtool.m4"; then
    19091956  eval "$as_ac_File=yes"
    19101957else
     
    19151962echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    19161963if test `eval echo '${'$as_ac_File'}'` = yes; then
    1917   LIBTOOLM4="$p/share/aclocal/libtool.m4"
    1918                      LIBTOOLPREFIX="$p"
    1919 fi
    1920 
    1921       if test x"$LIBTOOLM4" != x; then
    1922         break;
    1923       fi
    1924     done
    1925     if test x"$LIBTOOLM4" = x; then
    1926       { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find the file libtool.m4 on your system.  Please set the prefix of the location of the correct file with the LIBTOOLPREFIX variable, so that it is in $LIBTOOLPREFIX/share/aclocal.  We assume here that it is the plain version obtained from the GNU tarball." >&5
    1927 echo "$as_me: error: You specified you want to use maintainer mode, but I cannot find the file libtool.m4 on your system.  Please set the prefix of the location of the correct file with the LIBTOOLPREFIX variable, so that it is in $LIBTOOLPREFIX/share/aclocal.  We assume here that it is the plain version obtained from the GNU tarball." >&2;}
    1928    { (exit 1); exit 1; }; }
    1929     fi
    1930   else
    1931     as_ac_File=`echo "ac_cv_file_$LIBTOOLPREFIX/share/aclocal/libtool.m4" | $as_tr_sh`
    1932 echo "$as_me:$LINENO: checking for $LIBTOOLPREFIX/share/aclocal/libtool.m4" >&5
    1933 echo $ECHO_N "checking for $LIBTOOLPREFIX/share/aclocal/libtool.m4... $ECHO_C" >&6
     1964  LIBTOOLM4="$want_dir/aclocal/libtool.m4"
     1965else
     1966  { { echo "$as_me:$LINENO: error: I cannot find the libtool.m4 file." >&5
     1967echo "$as_me: error: I cannot find the libtool.m4 file." >&2;}
     1968   { (exit 1); exit 1; }; }
     1969fi
     1970
     1971
     1972  # Check if this is the correct version of libtool (with escaped dots)
     1973  correct_version='1.5.22'
     1974  grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     1975  as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
     1976echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
     1977echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
    19341978if eval "test \"\${$as_ac_File+set}\" = set"; then
    19351979  echo $ECHO_N "(cached) $ECHO_C" >&6
     
    19391983echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    19401984   { (exit 1); exit 1; }; }
    1941 if test -r "$LIBTOOLPREFIX/share/aclocal/libtool.m4"; then
    1942   eval "$as_ac_File=yes"
    1943 else
    1944   eval "$as_ac_File=no"
    1945 fi
    1946 fi
    1947 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
    1948 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    1949 if test `eval echo '${'$as_ac_File'}'` = yes; then
    1950   LIBTOOLM4="$LIBTOOLPREFIX/share/aclocal/libtool.m4"
    1951 else
    1952   { { echo "$as_me:$LINENO: error: You specified LIBTOOLPREFIX, but I cannot find the file libtool.m4 in $LIBTOOLPREFIX/share/aclocal." >&5
    1953 echo "$as_me: error: You specified LIBTOOLPREFIX, but I cannot find the file libtool.m4 in $LIBTOOLPREFIX/share/aclocal." >&2;}
    1954    { (exit 1); exit 1; }; }
    1955 fi
    1956 
    1957   fi
    1958 
    1959   # Check if this is the correct version of libtool (with escaped dots)
    1960   correct_version='1.5.22'
    1961   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    1962   as_ac_File=`echo "ac_cv_file_$LIBTOOLPREFIX/share/libtool/ltmain.sh" | $as_tr_sh`
    1963 echo "$as_me:$LINENO: checking for $LIBTOOLPREFIX/share/libtool/ltmain.sh" >&5
    1964 echo $ECHO_N "checking for $LIBTOOLPREFIX/share/libtool/ltmain.sh... $ECHO_C" >&6
    1965 if eval "test \"\${$as_ac_File+set}\" = set"; then
    1966   echo $ECHO_N "(cached) $ECHO_C" >&6
    1967 else
    1968   test "$cross_compiling" = yes &&
    1969   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    1970 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    1971    { (exit 1); exit 1; }; }
    1972 if test -r "$LIBTOOLPREFIX/share/libtool/ltmain.sh"; then
     1985if test -r "$want_dir/libtool/ltmain.sh"; then
    19731986  eval "$as_ac_File=yes"
    19741987else
     
    19872000echo $ECHO_N "checking whether we are using the correct version ($correct_version) of libtool.... $ECHO_C" >&6
    19882001  if test $have_ltmain = yes; then
    1989     if $EGREP $grep_version $LIBTOOLPREFIX/share/libtool/ltmain.sh >/dev/null 2>&1; then
     2002    if $EGREP $grep_version $want_dir/libtool/ltmain.sh >/dev/null 2>&1; then
    19902003      echo "$as_me:$LINENO: result: yes" >&5
    19912004echo "${ECHO_T}yes" >&6
     
    19932006      echo "$as_me:$LINENO: result: no" >&5
    19942007echo "${ECHO_T}no" >&6
    1995       { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool.  Please set LIBTOOLPREFIX to the correct installation prefix, so that the correct version of ltmain.sh is in $LIBTOOLPREFIX/share/libtool." >&5
    1996 echo "$as_me: error: You don't have the correct version of libtool.  Please set LIBTOOLPREFIX to the correct installation prefix, so that the correct version of ltmain.sh is in $LIBTOOLPREFIX/share/libtool." >&2;}
     2008      { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool." >&5
     2009echo "$as_me: error: You don't have the correct version of libtool." >&2;}
    19972010   { (exit 1); exit 1; }; }
    19982011    fi
    19992012  else
    2000     { { echo "$as_me:$LINENO: error: I cannot find the file ltmain.sh in $LIBTOOLPREFIX/share/libtool" >&5
    2001 echo "$as_me: error: I cannot find the file ltmain.sh in $LIBTOOLPREFIX/share/libtool" >&2;}
     2013    echo "$as_me:$LINENO: result: no" >&5
     2014echo "${ECHO_T}no" >&6
     2015    { { echo "$as_me:$LINENO: error: I cannot find the ltmain.sh file." >&5
     2016echo "$as_me: error: I cannot find the ltmain.sh file." >&2;}
    20022017   { (exit 1); exit 1; }; }
    20032018  fi
Note: See TracChangeset for help on using the changeset viewer.