Changeset 167 for ThirdParty/ASL/trunk


Ignore:
Timestamp:
Dec 9, 2006 1:18:55 AM (13 years ago)
Author:
andreasw
Message:

regenerated configure for new trunk coin.m4 (reuse libtool script)

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/configure

    r160 r167  
    27472747
    27482748
    2749 # We filter out the -pedantic-errors flag for C compiler because
    2750 # ASL otherwise doesn't compile
    2751 CFLAGS=`echo $CFLAGS | sed -e s/-pedantic-errors//g`
    2752 
    2753 
    27542749# Initialize automake
    27552750am__api_version="1.9"
     
    33783373  AUTOTOOLS_DFLT=$HOME
    33793374
    3380   # Check if we have autoconf
    3381   # Extract the first word of "autoconf", so it can be a program name with args.
     3375  echo "$as_me:$LINENO: checking whether we are using the correct autotools" >&5
     3376echo $ECHO_N "checking whether we are using the correct autotools... $ECHO_C" >&6
     3377if test "${ac_cv_use_correct_autotools+set}" = set; then
     3378  echo $ECHO_N "(cached) $ECHO_C" >&6
     3379else
     3380  ac_cv_use_correct_autotools=check
     3381fi
     3382echo "$as_me:$LINENO: result: $ac_cv_use_correct_autotools" >&5
     3383echo "${ECHO_T}$ac_cv_use_correct_autotools" >&6
     3384
     3385  if test $ac_cv_use_correct_autotools = check; then
     3386    ac_cv_use_correct_autotools=yes
     3387    # Check if we have autoconf
     3388    # Extract the first word of "autoconf", so it can be a program name with args.
    33823389set dummy autoconf; ac_word=$2
    33833390echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    34153422fi
    34163423
    3417   if test $have_autoconf = no; then
    3418     { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&5
     3424    if test $have_autoconf = no; then
     3425      { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&5
    34193426echo "$as_me: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&2;}
    34203427   { (exit 1); exit 1; }; }
    3421   fi
    3422 
    3423   # Check whether autoconf is the correct version
    3424   correct_version='2.59'
    3425   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3426   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of autoconf" >&5
     3428    fi
     3429
     3430    # Check whether autoconf is the correct version
     3431    correct_version='2.59'
     3432    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3433    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of autoconf" >&5
    34273434echo $ECHO_N "checking whether we are using the correct version ($correct_version) of autoconf... $ECHO_C" >&6
    3428   autoconf --version > confauto.out 2>&1
    3429   if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
    3430     echo "$as_me:$LINENO: result: yes" >&5
     3435    autoconf --version > confauto.out 2>&1
     3436    if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
     3437      echo "$as_me:$LINENO: result: yes" >&5
    34313438echo "${ECHO_T}yes" >&6
    3432   else
    3433     rm -f confauto.out
    3434     echo "$as_me:$LINENO: result: no" >&5
     3439    else
     3440      rm -f confauto.out
     3441      echo "$as_me:$LINENO: result: no" >&5
    34353442echo "${ECHO_T}no" >&6
    3436     { { echo "$as_me:$LINENO: error: You don't have the correct version of autoconf as the first one in your path." >&5
     3443      { { echo "$as_me:$LINENO: error: You don't have the correct version of autoconf as the first one in your path." >&5
    34373444echo "$as_me: error: You don't have the correct version of autoconf as the first one in your path." >&2;}
    34383445   { (exit 1); exit 1; }; }
    3439   fi
    3440   rm -f confauto.out
    3441 
    3442   # Check if the executable autoconf is picked up from the correct location
    3443   echo "$as_me:$LINENO: checking whether autoconf is coming from the correct location" >&5
     3446    fi
     3447    rm -f confauto.out
     3448
     3449    # Check if the executable autoconf is picked up from the correct location
     3450    echo "$as_me:$LINENO: checking whether autoconf is coming from the correct location" >&5
    34443451echo $ECHO_N "checking whether autoconf is coming from the correct location... $ECHO_C" >&6
    3445   autoconf_dir=`which autoconf | sed -e 's=/autoconf=='`
    3446   autoconf_dir=`cd $autoconf_dir; pwd`
    3447   if test x$AUTOTOOLS_DIR = x; then
    3448     want_dir=$AUTOTOOLS_DFLT/bin
    3449   else
    3450     want_dir=$AUTOTOOLS_DIR/bin
    3451   fi
    3452   if test $autoconf_dir = `cd $want_dir; pwd`; then
    3453     echo "$as_me:$LINENO: result: yes" >&5
     3452    autoconf_dir=`which autoconf | sed -e 's=/autoconf=='`
     3453    autoconf_dir=`cd $autoconf_dir; pwd`
     3454    if test x$AUTOTOOLS_DIR = x; then
     3455      want_dir=$AUTOTOOLS_DFLT/bin
     3456    else
     3457      want_dir=$AUTOTOOLS_DIR/bin
     3458    fi
     3459    if test $autoconf_dir = `cd $want_dir; pwd`; then
     3460      echo "$as_me:$LINENO: result: yes" >&5
    34543461echo "${ECHO_T}yes" >&6
    3455   else
    3456     rm -f confauto.out
    3457     echo "$as_me:$LINENO: result: no" >&5
     3462    else
     3463      rm -f confauto.out
     3464      echo "$as_me:$LINENO: result: no" >&5
    34583465echo "${ECHO_T}no" >&6
    3459     { { echo "$as_me:$LINENO: error: The autoconf executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
     3466      { { echo "$as_me:$LINENO: error: The autoconf executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
    34603467echo "$as_me: error: The autoconf executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&2;}
    34613468   { (exit 1); exit 1; }; }
    3462   fi
    3463 
    3464   # Check if we have automake
    3465   # Extract the first word of "automake", so it can be a program name with args.
     3469    fi
     3470
     3471    # Check if we have automake
     3472    # Extract the first word of "automake", so it can be a program name with args.
    34663473set dummy automake; ac_word=$2
    34673474echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    34993506fi
    35003507
    3501   if test $have_automake = no; then
    3502     { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&5
     3508    if test $have_automake = no; then
     3509      { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&5
    35033510echo "$as_me: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&2;}
    35043511   { (exit 1); exit 1; }; }
    3505   fi
    3506 
    3507   # Check whether automake is the correct version
    3508   correct_version='1.9.6'
    3509   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3510   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of automake" >&5
     3512    fi
     3513
     3514    # Check whether automake is the correct version
     3515    correct_version='1.9.6'
     3516    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3517    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of automake" >&5
    35113518echo $ECHO_N "checking whether we are using the correct version ($correct_version) of automake... $ECHO_C" >&6
    3512   automake --version > confauto.out 2>&1
    3513   if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
    3514     echo "$as_me:$LINENO: result: yes" >&5
     3519    automake --version > confauto.out 2>&1
     3520    if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
     3521      echo "$as_me:$LINENO: result: yes" >&5
    35153522echo "${ECHO_T}yes" >&6
    3516   else
    3517     rm -f confauto.out
    3518     echo "$as_me:$LINENO: result: no" >&5
     3523    else
     3524      rm -f confauto.out
     3525      echo "$as_me:$LINENO: result: no" >&5
    35193526echo "${ECHO_T}no" >&6
    3520     { { echo "$as_me:$LINENO: error: You don't have the correct version of automake as the first one in your path." >&5
     3527      { { echo "$as_me:$LINENO: error: You don't have the correct version of automake as the first one in your path." >&5
    35213528echo "$as_me: error: You don't have the correct version of automake as the first one in your path." >&2;}
    35223529   { (exit 1); exit 1; }; }
    3523   fi
    3524   rm -f confauto.out
    3525 
    3526   # Check if the executable automake is picked up from the correct location
    3527   echo "$as_me:$LINENO: checking whether automake is coming from the correct location" >&5
     3530    fi
     3531    rm -f confauto.out
     3532
     3533    # Check if the executable automake is picked up from the correct location
     3534    echo "$as_me:$LINENO: checking whether automake is coming from the correct location" >&5
    35283535echo $ECHO_N "checking whether automake is coming from the correct location... $ECHO_C" >&6
    3529   automake_dir=`which automake | sed -e 's=/automake=='`
    3530   automake_dir=`cd $automake_dir; pwd`
    3531   if test x$AUTOTOOLS_DIR = x; then
    3532     want_dir=$AUTOTOOLS_DFLT/bin
    3533   else
    3534     want_dir=$AUTOTOOLS_DIR/bin
    3535   fi
    3536   if test $automake_dir = `cd $want_dir; pwd`; then
    3537     echo "$as_me:$LINENO: result: yes" >&5
     3536    automake_dir=`which automake | sed -e 's=/automake=='`
     3537    automake_dir=`cd $automake_dir; pwd`
     3538    if test x$AUTOTOOLS_DIR = x; then
     3539      want_dir=$AUTOTOOLS_DFLT/bin
     3540    else
     3541      want_dir=$AUTOTOOLS_DIR/bin
     3542    fi
     3543    if test $automake_dir = `cd $want_dir; pwd`; then
     3544      echo "$as_me:$LINENO: result: yes" >&5
    35383545echo "${ECHO_T}yes" >&6
    3539   else
    3540     rm -f confauto.out
    3541     echo "$as_me:$LINENO: result: no" >&5
     3546    else
     3547      rm -f confauto.out
     3548      echo "$as_me:$LINENO: result: no" >&5
    35423549echo "${ECHO_T}no" >&6
    3543     { { echo "$as_me:$LINENO: error: The automake executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
     3550      { { echo "$as_me:$LINENO: error: The automake executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
    35443551echo "$as_me: error: The automake executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&2;}
    35453552   { (exit 1); exit 1; }; }
     3553    fi
     3554
     3555    # Check if this is the correct version of libtool (with escaped dots)
     3556    if test x$AUTOTOOLS_DIR = x; then
     3557      want_dir=$AUTOTOOLS_DFLT/share
     3558    else
     3559      want_dir=$AUTOTOOLS_DIR/share
     3560    fi
     3561    correct_version='1.5.22'
     3562    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3563    as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
     3564echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
     3565echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
     3566if eval "test \"\${$as_ac_File+set}\" = set"; then
     3567  echo $ECHO_N "(cached) $ECHO_C" >&6
     3568else
     3569  test "$cross_compiling" = yes &&
     3570  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
     3571echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
     3572   { (exit 1); exit 1; }; }
     3573if test -r "$want_dir/libtool/ltmain.sh"; then
     3574  eval "$as_ac_File=yes"
     3575else
     3576  eval "$as_ac_File=no"
     3577fi
     3578fi
     3579echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
     3580echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
     3581if test `eval echo '${'$as_ac_File'}'` = yes; then
     3582  have_ltmain=yes
     3583else
     3584  have_ltmain=no
     3585fi
     3586
     3587    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of libtool." >&5
     3588echo $ECHO_N "checking whether we are using the correct version ($correct_version) of libtool.... $ECHO_C" >&6
     3589    if test $have_ltmain = yes; then
     3590    if $EGREP $grep_version $want_dir/libtool/ltmain.sh >/dev/null 2>&1; then
     3591        echo "$as_me:$LINENO: result: yes" >&5
     3592echo "${ECHO_T}yes" >&6
     3593      else
     3594        echo "$as_me:$LINENO: result: no" >&5
     3595echo "${ECHO_T}no" >&6
     3596        { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool." >&5
     3597echo "$as_me: error: You don't have the correct version of libtool." >&2;}
     3598   { (exit 1); exit 1; }; }
     3599      fi
     3600    else
     3601      echo "$as_me:$LINENO: result: no" >&5
     3602echo "${ECHO_T}no" >&6
     3603      { { echo "$as_me:$LINENO: error: I cannot find the ltmain.sh file." >&5
     3604echo "$as_me: error: I cannot find the ltmain.sh file." >&2;}
     3605   { (exit 1); exit 1; }; }
     3606    fi
    35463607  fi
    35473608
     
    35783639fi
    35793640
    3580 
    3581   # Check if this is the correct version of libtool (with escaped dots)
    3582   correct_version='1.5.22'
    3583   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3584   as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
    3585 echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
    3586 echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
    3587 if eval "test \"\${$as_ac_File+set}\" = set"; then
    3588   echo $ECHO_N "(cached) $ECHO_C" >&6
    3589 else
    3590   test "$cross_compiling" = yes &&
    3591   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    3592 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    3593    { (exit 1); exit 1; }; }
    3594 if test -r "$want_dir/libtool/ltmain.sh"; then
    3595   eval "$as_ac_File=yes"
    3596 else
    3597   eval "$as_ac_File=no"
    3598 fi
    3599 fi
    3600 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
    3601 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    3602 if test `eval echo '${'$as_ac_File'}'` = yes; then
    3603   have_ltmain=yes
    3604 else
    3605   have_ltmain=no
    3606 fi
    3607 
    3608   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of libtool." >&5
    3609 echo $ECHO_N "checking whether we are using the correct version ($correct_version) of libtool.... $ECHO_C" >&6
    3610   if test $have_ltmain = yes; then
    3611     if $EGREP $grep_version $want_dir/libtool/ltmain.sh >/dev/null 2>&1; then
    3612       echo "$as_me:$LINENO: result: yes" >&5
    3613 echo "${ECHO_T}yes" >&6
    3614     else
    3615       echo "$as_me:$LINENO: result: no" >&5
    3616 echo "${ECHO_T}no" >&6
    3617       { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool." >&5
    3618 echo "$as_me: error: You don't have the correct version of libtool." >&2;}
    3619    { (exit 1); exit 1; }; }
    3620     fi
    3621   else
    3622     echo "$as_me:$LINENO: result: no" >&5
    3623 echo "${ECHO_T}no" >&6
    3624     { { echo "$as_me:$LINENO: error: I cannot find the ltmain.sh file." >&5
    3625 echo "$as_me: error: I cannot find the ltmain.sh file." >&2;}
    3626    { (exit 1); exit 1; }; }
    3627   fi
    36283641
    36293642  # Check if we have an Externals file
     
    36693682
    36703683  if test x$have_svn = xyes; then
    3671     echo "$as_me:$LINENO: checking svn understands https" >&5
    3672 echo $ECHO_N "checking svn understands https... $ECHO_C" >&6
    3673     svn --version > confauto.out 2>&1
    3674     if $EGREP https confauto.out >/dev/null 2>&1; then
    3675       echo "$as_me:$LINENO: result: yes" >&5
    3676 echo "${ECHO_T}yes" >&6
    3677     else
    3678       echo "$as_me:$LINENO: result: no" >&5
    3679 echo "${ECHO_T}no" >&6
    3680       have_svn=no
    3681     fi
    3682     rm -f confauto.out
     3684    echo "$as_me:$LINENO: checking whether svn understands https" >&5
     3685echo $ECHO_N "checking whether svn understands https... $ECHO_C" >&6
     3686if test "${ac_cv_svn_understands_https+set}" = set; then
     3687  echo $ECHO_N "(cached) $ECHO_C" >&6
     3688else
     3689  svn --version > confauto.out 2>&1
     3690                    if $EGREP https confauto.out >/dev/null 2>&1; then
     3691                      ac_cv_svn_understands_https=yes
     3692                    else
     3693                      ac_cv_svn_understands_https=no
     3694                      have_svn=no
     3695                      ac_cv_prog_have_svn=no
     3696                    fi
     3697                    rm -f confauto.out
     3698fi
     3699echo "$as_me:$LINENO: result: $ac_cv_svn_understands_https" >&5
     3700echo "${ECHO_T}$ac_cv_svn_understands_https" >&6
    36833701  fi
    36843702
  • ThirdParty/ASL/trunk/configure.ac

    r158 r167  
    5050coin_skip_warn_cflags=yes
    5151AC_COIN_PROG_CC
    52 
    53 # We filter out the -pedantic-errors flag for C compiler because
    54 # ASL otherwise doesn't compile
    55 CFLAGS=`echo $CFLAGS | sed -e s/-pedantic-errors//g`
    56 
    5752
    5853# Initialize automake
Note: See TracChangeset for help on using the changeset viewer.