Changeset 220 for ThirdParty


Ignore:
Timestamp:
Feb 1, 2007 7:17:36 PM (13 years ago)
Author:
andreasw
Message:

synchronizing ASL stable with trunk (rev 216)

Location:
ThirdParty/ASL/stable/1.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.0/configure

    r188 r220  
    846846  --enable-debug-asl compile this project (ASL) with debug options
    847847  --enable-doscompile     Under Cygwin, compile so that executables run under
    848                           DOS (default: disabled)
     848                          DOS. Set to mingw to use gcc/g++/ld with
     849                          -mno-cygwin. Set to msvc to use cl/link. Default
     850                          when mentioned: mingw. Default when not mentioned:
     851                          disabled.
    849852  --disable-dependency-tracking  speeds up one-time build
    850853  --enable-dependency-tracking   do not reject slow dependency extractors
     
    13431346
    13441347# Initialize the ADDLIBS variable
    1345 ADDLIBS='-lm'
     1348ADDLIBS="-lm $LIBS"
    13461349
    13471350
    13481351# Initialize the FADDLIBS variable (which is to be used with a fortran
    13491352# compiler and will not include FLIBS)
    1350 FADDLIBS=
     1353FADDLIBS="$LIBS"
    13511354
    13521355
     
    15551558    fi
    15561559    ;;
    1557 esac
    1558 
    1559 # Check whether --enable-doscompile or --disable-doscompile was given.
     1560 esac
     1561 case $enable_doscompile in
     1562   msvc)
     1563     if test "x${LD+set}" = xset; then :; else
     1564       LD=link
     1565     fi
     1566     ;;
     1567 esac
     1568
     1569
     1570 # Check whether --enable-doscompile or --disable-doscompile was given.
    15601571if test "${enable_doscompile+set}" = set; then
    15611572  enableval="$enable_doscompile"
    1562   if test "$enable_doscompile = yes"; then
    1563   case $build in
    1564     *-cygwin*) ;;
    1565     *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes only sense under Cygwin" >&5
    1566 echo "$as_me: error: --enable-doscompile option makes only sense under Cygwin" >&2;}
     1573  if test "$enable_doscompile" != no; then
     1574     case $build in
     1575       *-cygwin*) ;;
     1576       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin" >&5
     1577echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin" >&2;}
    15671578   { (exit 1); exit 1; }; } ;;
    1568   esac
    1569 fi
     1579     esac
     1580   fi
    15701581else
    15711582  enable_doscompile=no
    15721583fi;
     1584 case "$enable_doscompile" in
     1585   msvc|mingw|no) ;;
     1586   yes) enable_doscompile=mingw ;;
     1587   *) { { echo "$as_me:$LINENO: error: Invalid value $enable_doscompile for --enable-doscompile.
     1588                    Try configure --help=recursive." >&5
     1589echo "$as_me: error: Invalid value $enable_doscompile for --enable-doscompile.
     1590                    Try configure --help=recursive." >&2;}
     1591   { (exit 1); exit 1; }; }
     1592      ;;
     1593  esac
     1594  if test "$enable_doscompile" != no ; then
     1595    { echo "$as_me:$LINENO: DOS compile style is: $enable_doscompile" >&5
     1596echo "$as_me: DOS compile style is: $enable_doscompile" >&6;}
     1597  fi
    15731598
    15741599
     
    16041629
    16051630save_cflags="$CFLAGS"
     1631# For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
     1632# ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which
     1633# is likely to be a non-functional shell. But many installations will have
     1634# both cc and gcc, so promoting gcc isn't good either. How to test reliably?
    16061635case $build in
    16071636  *-cygwin* | *-mingw*)
    1608              comps="gcc cl" ;;
     1637             if test "$enable_doscompile" = msvc ; then
     1638               comps="cl"
     1639             else
     1640               comps="gcc cl"
     1641             fi ;;
     1642  sparc-sun-solaris*)
     1643             comps="cc xlc gcc pgcc icc" ;;
    16091644  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    16101645  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
     
    16121647
    16131648# We delete the cached value, since the test might not have been
    1614 # performed with out choise of compilers earlier
     1649# performed with our choice of compilers earlier
    16151650$as_unset ac_cv_prog_CC || test "${ac_cv_prog_CC+set}" != set || { ac_cv_prog_CC=; export ac_cv_prog_CC; }
     1651# AC_MSG_NOTICE([C compiler candidates: $comps])
    16161652ac_ext=c
    16171653ac_cpp='$CPP $CPPFLAGS'
     
    23272363ac_compiler_gnu=$ac_cv_c_compiler_gnu
    23282364
     2365if test -z "$CC" ; then
     2366  { { echo "$as_me:$LINENO: error: Failed to find a C compiler!" >&5
     2367echo "$as_me: error: Failed to find a C compiler!" >&2;}
     2368   { (exit 1); exit 1; }; }
     2369fi
     2370# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
     2371case "$CC" in
     2372  cl* | */cl* | CL* | */CL* )
     2373    if test "$ac_cv_prog_cc_g" = yes ; then
     2374      ac_cv_prog_cc_g=no
     2375      { echo "$as_me:$LINENO: Overruling autoconf; cl does not recognise -g." >&5
     2376echo "$as_me: Overruling autoconf; cl does not recognise -g." >&6;}
     2377    fi ;;
     2378esac
    23292379CFLAGS="$save_cflags"
    23302380
     
    23532403        coin_dbg_cflags="-g"
    23542404        coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
    2355         if test "$enable_doscompile" = yes; then
    2356           case $build in
    2357             *-cygwin*)
    2358               CFLAGS="-mno-cygwin"
    2359               cat >conftest.$ac_ext <<_ACEOF
     2405        case $enable_doscompile in
     2406          mingw)
     2407            CFLAGS="-mno-cygwin"
     2408            cat >conftest.$ac_ext <<_ACEOF
    23602409/* confdefs.h.  */
    23612410_ACEOF
     
    24022451rm -f conftest.err conftest.$ac_objext \
    24032452      conftest$ac_exeext conftest.$ac_ext
    2404               CFLAGS=
    2405             ;;
    2406           esac
    2407         fi
     2453            CFLAGS=
     2454          ;;
     2455        esac
    24082456    esac
    24092457  fi
     
    24132461        case "$CC" in
    24142462          cl* | */cl* | CL* | */CL*)
    2415             coin_opt_cflags='-O2'
    2416             coin_add_cflags='-nologo'
     2463            coin_opt_cflags='-MT -O2'
     2464            coin_add_cflags='-nologo -wd4996'
    24172465            coin_dbg_cflags='-MTd'
    24182466            ;;
     
    25902638fi
    25912639
    2592 # Check if user wants to have additional CFLAGS options
    2593 
    2594 if test x"$ADD_CFLAGS" != x; then
    2595   CFLAGS="$CFLAGS $ADD_CFLAGS"
    2596 fi
     2640# If CFLAGS contains -mno-cygwin, CPPFLAGS must also have it.
     2641
     2642case "$CFLAGS" in
     2643  *-mno-cygwin*)
     2644    if test x${CPPFLAGS+set} != xset ; then
     2645      CPPFLAGS="-mno-cygwin"
     2646    else
     2647      case "$CPPFLAGS" in
     2648        *-mno-cygwin*)
     2649          ;;
     2650        *)
     2651          CPPFLAGS="$CPPFLAGS -mno-cygwin"
     2652          ;;
     2653      esac
     2654    fi ;;
     2655esac
    25972656
    25982657# Try if CFLAGS works
     
    27202779    fi
    27212780    ;;
    2722 esac
     2781 esac
     2782 case $enable_doscompile in
     2783   msvc)
     2784     if test "x${LD+set}" = xset; then :; else
     2785       LD=link
     2786     fi
     2787     ;;
     2788 esac
    27232789
    27242790    ;;
     
    27312797ac_compiler_gnu=$ac_cv_c_compiler_gnu
    27322798
    2733 
    2734 
    2735 # We filter out the -pedantic-errors flag for C compiler because
    2736 # ASL otherwise doesn't compile
    2737 CFLAGS=`echo $CFLAGS | sed -e s/-pedantic-errors//g`
    27382799
    27392800
     
    30673128
    30683129
     3130
     3131# AC_MSG_NOTICE([Beginning automake initialisation.])
    30693132# Stuff for automake
    30703133# test to see if srcdir already configured
     
    33563419
    33573420  # If maintainer mode is chosen, we make sure that the correct versions
    3358   # of the tools are used, and that we know where libtoo.m4 is (to
     3421  # of the tools are used, and that we know where libtool.m4 is (to
    33593422  # recreate acinclude.m4)
    33603423
    33613424
    33623425  LIBTOOLM4=
    3363 
    3364   # Check if we have autoconf
    3365   # Extract the first word of "autoconf", so it can be a program name with args.
     3426  # Normally, $HOME
     3427  AUTOTOOLS_DFLT=$HOME
     3428
     3429  echo "$as_me:$LINENO: checking whether we are using the correct autotools" >&5
     3430echo $ECHO_N "checking whether we are using the correct autotools... $ECHO_C" >&6
     3431if test "${ac_cv_use_correct_autotools+set}" = set; then
     3432  echo $ECHO_N "(cached) $ECHO_C" >&6
     3433else
     3434  ac_cv_use_correct_autotools=check
     3435fi
     3436echo "$as_me:$LINENO: result: $ac_cv_use_correct_autotools" >&5
     3437echo "${ECHO_T}$ac_cv_use_correct_autotools" >&6
     3438
     3439  if test $ac_cv_use_correct_autotools = check; then
     3440    ac_cv_use_correct_autotools=yes
     3441    # Check if we have autoconf
     3442    # Extract the first word of "autoconf", so it can be a program name with args.
    33663443set dummy autoconf; ac_word=$2
    33673444echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    33993476fi
    34003477
    3401   if test $have_autoconf = no; then
    3402     { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&5
     3478    if test $have_autoconf = no; then
     3479      { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&5
    34033480echo "$as_me: error: You specified you want to use maintainer mode, but I cannot find autoconf in your path." >&2;}
    34043481   { (exit 1); exit 1; }; }
    3405   fi
    3406 
    3407   # Check whether autoconf is the correct version
    3408   correct_version='2.59'
    3409   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3410   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of autoconf" >&5
     3482    fi
     3483
     3484    # Check whether autoconf is the correct version
     3485    correct_version='2.59'
     3486    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3487    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of autoconf" >&5
    34113488echo $ECHO_N "checking whether we are using the correct version ($correct_version) of autoconf... $ECHO_C" >&6
    3412   autoconf --version > confauto.out 2>&1
    3413   if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
    3414     echo "$as_me:$LINENO: result: yes" >&5
     3489    autoconf --version > confauto.out 2>&1
     3490    if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
     3491      echo "$as_me:$LINENO: result: yes" >&5
    34153492echo "${ECHO_T}yes" >&6
    3416   else
    3417     rm -f confauto.out
    3418     echo "$as_me:$LINENO: result: no" >&5
     3493    else
     3494      rm -f confauto.out
     3495      echo "$as_me:$LINENO: result: no" >&5
    34193496echo "${ECHO_T}no" >&6
    3420     { { echo "$as_me:$LINENO: error: You don't have the correct version of autoconf as the first one in your path." >&5
     3497      { { echo "$as_me:$LINENO: error: You don't have the correct version of autoconf as the first one in your path." >&5
    34213498echo "$as_me: error: You don't have the correct version of autoconf as the first one in your path." >&2;}
    34223499   { (exit 1); exit 1; }; }
    3423   fi
    3424   rm -f confauto.out
    3425 
    3426   # Check if the executable autoconf is picked up from the correct location
    3427   echo "$as_me:$LINENO: checking whether autoconf is coming from the correct location" >&5
     3500    fi
     3501    rm -f confauto.out
     3502
     3503    # Check if the executable autoconf is picked up from the correct location
     3504    echo "$as_me:$LINENO: checking whether autoconf is coming from the correct location" >&5
    34283505echo $ECHO_N "checking whether autoconf is coming from the correct location... $ECHO_C" >&6
    3429   autoconf_dir=`which autoconf | sed -e 's=/autoconf=='`
    3430   autoconf_dir=`cd $autoconf_dir; pwd`
    3431   if test x$AUTOTOOLS_DIR = x; then
    3432     want_dir=$HOME/bin
    3433   else
    3434     want_dir=$AUTOTOOLS_DIR/bin
    3435   fi
    3436   if test $autoconf_dir = `cd $want_dir; pwd`; then
    3437     echo "$as_me:$LINENO: result: yes" >&5
     3506    autoconf_dir=`which autoconf | sed -e 's=/autoconf=='`
     3507    autoconf_dir=`cd $autoconf_dir; pwd`
     3508    if test x$AUTOTOOLS_DIR = x; then
     3509      want_dir=$AUTOTOOLS_DFLT/bin
     3510    else
     3511      want_dir=$AUTOTOOLS_DIR/bin
     3512    fi
     3513    if test $autoconf_dir = `cd $want_dir; pwd`; then
     3514      echo "$as_me:$LINENO: result: yes" >&5
    34383515echo "${ECHO_T}yes" >&6
    3439   else
    3440     rm -f confauto.out
    3441     echo "$as_me:$LINENO: result: no" >&5
     3516    else
     3517      rm -f confauto.out
     3518      echo "$as_me:$LINENO: result: no" >&5
    34423519echo "${ECHO_T}no" >&6
    3443     { { echo "$as_me:$LINENO: error: The autoconf executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&5
    3444 echo "$as_me: error: The autoconf executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&2;}
     3520      { { echo "$as_me:$LINENO: error: The autoconf executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
     3521echo "$as_me: error: The autoconf executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&2;}
    34453522   { (exit 1); exit 1; }; }
    3446   fi
    3447 
    3448   # Check if we have automake
    3449   # Extract the first word of "automake", so it can be a program name with args.
     3523    fi
     3524
     3525    # Check if we have automake
     3526    # Extract the first word of "automake", so it can be a program name with args.
    34503527set dummy automake; ac_word=$2
    34513528echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    34833560fi
    34843561
    3485   if test $have_automake = no; then
    3486     { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&5
     3562    if test $have_automake = no; then
     3563      { { echo "$as_me:$LINENO: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&5
    34873564echo "$as_me: error: You specified you want to use maintainer mode, but I cannot find automake in your path." >&2;}
    34883565   { (exit 1); exit 1; }; }
    3489   fi
    3490 
    3491   # Check whether automake is the correct version
    3492   correct_version='1.9.6'
    3493   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3494   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of automake" >&5
     3566    fi
     3567
     3568    # Check whether automake is the correct version
     3569    correct_version='1.9.6'
     3570    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3571    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of automake" >&5
    34953572echo $ECHO_N "checking whether we are using the correct version ($correct_version) of automake... $ECHO_C" >&6
    3496   automake --version > confauto.out 2>&1
    3497   if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
    3498     echo "$as_me:$LINENO: result: yes" >&5
     3573    automake --version > confauto.out 2>&1
     3574    if $EGREP $grep_version confauto.out >/dev/null 2>&1; then
     3575      echo "$as_me:$LINENO: result: yes" >&5
    34993576echo "${ECHO_T}yes" >&6
    3500   else
    3501     rm -f confauto.out
    3502     echo "$as_me:$LINENO: result: no" >&5
     3577    else
     3578      rm -f confauto.out
     3579      echo "$as_me:$LINENO: result: no" >&5
    35033580echo "${ECHO_T}no" >&6
    3504     { { echo "$as_me:$LINENO: error: You don't have the correct version of automake as the first one in your path." >&5
     3581      { { echo "$as_me:$LINENO: error: You don't have the correct version of automake as the first one in your path." >&5
    35053582echo "$as_me: error: You don't have the correct version of automake as the first one in your path." >&2;}
    35063583   { (exit 1); exit 1; }; }
    3507   fi
    3508   rm -f confauto.out
    3509 
    3510   # Check if the executable automake is picked up from the correct location
    3511   echo "$as_me:$LINENO: checking whether automake is coming from the correct location" >&5
     3584    fi
     3585    rm -f confauto.out
     3586
     3587    # Check if the executable automake is picked up from the correct location
     3588    echo "$as_me:$LINENO: checking whether automake is coming from the correct location" >&5
    35123589echo $ECHO_N "checking whether automake is coming from the correct location... $ECHO_C" >&6
    3513   automake_dir=`which automake | sed -e 's=/automake=='`
    3514   automake_dir=`cd $automake_dir; pwd`
    3515   if test x$AUTOTOOLS_DIR = x; then
    3516     want_dir=$HOME/bin
    3517   else
    3518     want_dir=$AUTOTOOLS_DIR/bin
    3519   fi
    3520   if test $automake_dir = `cd $want_dir; pwd`; then
    3521     echo "$as_me:$LINENO: result: yes" >&5
     3590    automake_dir=`which automake | sed -e 's=/automake=='`
     3591    automake_dir=`cd $automake_dir; pwd`
     3592    if test x$AUTOTOOLS_DIR = x; then
     3593      want_dir=$AUTOTOOLS_DFLT/bin
     3594    else
     3595      want_dir=$AUTOTOOLS_DIR/bin
     3596    fi
     3597    if test $automake_dir = `cd $want_dir; pwd`; then
     3598      echo "$as_me:$LINENO: result: yes" >&5
    35223599echo "${ECHO_T}yes" >&6
    3523   else
    3524     rm -f confauto.out
    3525     echo "$as_me:$LINENO: result: no" >&5
     3600    else
     3601      rm -f confauto.out
     3602      echo "$as_me:$LINENO: result: no" >&5
    35263603echo "${ECHO_T}no" >&6
    3527     { { echo "$as_me:$LINENO: error: The automake executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&5
    3528 echo "$as_me: error: The automake executable should be picked up from \$HOME/bin or \$AUTOTOOLS_DIR/bin." >&2;}
     3604      { { echo "$as_me:$LINENO: error: The automake executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&5
     3605echo "$as_me: error: The automake executable should be picked up from \$AUTOTOOLS_DFLT/bin or \$AUTOTOOLS_DIR/bin." >&2;}
    35293606   { (exit 1); exit 1; }; }
     3607    fi
     3608
     3609    # Check if this is the correct version of libtool (with escaped dots)
     3610    if test x$AUTOTOOLS_DIR = x; then
     3611      want_dir=$AUTOTOOLS_DFLT/share
     3612    else
     3613      want_dir=$AUTOTOOLS_DIR/share
     3614    fi
     3615    correct_version='1.5.22'
     3616    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     3617    as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
     3618echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
     3619echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
     3620if eval "test \"\${$as_ac_File+set}\" = set"; then
     3621  echo $ECHO_N "(cached) $ECHO_C" >&6
     3622else
     3623  test "$cross_compiling" = yes &&
     3624  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
     3625echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
     3626   { (exit 1); exit 1; }; }
     3627if test -r "$want_dir/libtool/ltmain.sh"; then
     3628  eval "$as_ac_File=yes"
     3629else
     3630  eval "$as_ac_File=no"
     3631fi
     3632fi
     3633echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
     3634echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
     3635if test `eval echo '${'$as_ac_File'}'` = yes; then
     3636  have_ltmain=yes
     3637else
     3638  have_ltmain=no
     3639fi
     3640
     3641    echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of libtool." >&5
     3642echo $ECHO_N "checking whether we are using the correct version ($correct_version) of libtool.... $ECHO_C" >&6
     3643    if test $have_ltmain = yes; then
     3644    if $EGREP $grep_version $want_dir/libtool/ltmain.sh >/dev/null 2>&1; then
     3645        echo "$as_me:$LINENO: result: yes" >&5
     3646echo "${ECHO_T}yes" >&6
     3647      else
     3648        echo "$as_me:$LINENO: result: no" >&5
     3649echo "${ECHO_T}no" >&6
     3650        { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool." >&5
     3651echo "$as_me: error: You don't have the correct version of libtool." >&2;}
     3652   { (exit 1); exit 1; }; }
     3653      fi
     3654    else
     3655      echo "$as_me:$LINENO: result: no" >&5
     3656echo "${ECHO_T}no" >&6
     3657      { { echo "$as_me:$LINENO: error: I cannot find the ltmain.sh file." >&5
     3658echo "$as_me: error: I cannot find the ltmain.sh file." >&2;}
     3659   { (exit 1); exit 1; }; }
     3660    fi
    35303661  fi
    35313662
    35323663  # Check if we can find the libtool file
    35333664  if test x$AUTOTOOLS_DIR = x; then
    3534     want_dir=$HOME/share
     3665    want_dir=$AUTOTOOLS_DFLT/share
    35353666  else
    35363667    want_dir=$AUTOTOOLS_DIR/share
     
    35623693fi
    35633694
    3564 
    3565   # Check if this is the correct version of libtool (with escaped dots)
    3566   correct_version='1.5.22'
    3567   grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    3568   as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
    3569 echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
    3570 echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
    3571 if eval "test \"\${$as_ac_File+set}\" = set"; then
    3572   echo $ECHO_N "(cached) $ECHO_C" >&6
    3573 else
    3574   test "$cross_compiling" = yes &&
    3575   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    3576 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    3577    { (exit 1); exit 1; }; }
    3578 if test -r "$want_dir/libtool/ltmain.sh"; then
    3579   eval "$as_ac_File=yes"
    3580 else
    3581   eval "$as_ac_File=no"
    3582 fi
    3583 fi
    3584 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
    3585 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    3586 if test `eval echo '${'$as_ac_File'}'` = yes; then
    3587   have_ltmain=yes
    3588 else
    3589   have_ltmain=no
    3590 fi
    3591 
    3592   echo "$as_me:$LINENO: checking whether we are using the correct version ($correct_version) of libtool." >&5
    3593 echo $ECHO_N "checking whether we are using the correct version ($correct_version) of libtool.... $ECHO_C" >&6
    3594   if test $have_ltmain = yes; then
    3595     if $EGREP $grep_version $want_dir/libtool/ltmain.sh >/dev/null 2>&1; then
    3596       echo "$as_me:$LINENO: result: yes" >&5
    3597 echo "${ECHO_T}yes" >&6
    3598     else
    3599       echo "$as_me:$LINENO: result: no" >&5
    3600 echo "${ECHO_T}no" >&6
    3601       { { echo "$as_me:$LINENO: error: You don't have the correct version of libtool." >&5
    3602 echo "$as_me: error: You don't have the correct version of libtool." >&2;}
    3603    { (exit 1); exit 1; }; }
    3604     fi
    3605   else
    3606     echo "$as_me:$LINENO: result: no" >&5
    3607 echo "${ECHO_T}no" >&6
    3608     { { echo "$as_me:$LINENO: error: I cannot find the ltmain.sh file." >&5
    3609 echo "$as_me: error: I cannot find the ltmain.sh file." >&2;}
    3610    { (exit 1); exit 1; }; }
    3611   fi
    36123695
    36133696  # Check if we have an Externals file
     
    36533736
    36543737  if test x$have_svn = xyes; then
    3655     echo "$as_me:$LINENO: checking svn understands https" >&5
    3656 echo $ECHO_N "checking svn understands https... $ECHO_C" >&6
    3657     svn --version > confauto.out 2>&1
    3658     if $EGREP https confauto.out >/dev/null 2>&1; then
    3659       echo "$as_me:$LINENO: result: yes" >&5
    3660 echo "${ECHO_T}yes" >&6
    3661     else
    3662       echo "$as_me:$LINENO: result: no" >&5
    3663 echo "${ECHO_T}no" >&6
    3664       have_svn=no
    3665     fi
    3666     rm -f confauto.out
     3738    echo "$as_me:$LINENO: checking whether svn understands https" >&5
     3739echo $ECHO_N "checking whether svn understands https... $ECHO_C" >&6
     3740if test "${ac_cv_svn_understands_https+set}" = set; then
     3741  echo $ECHO_N "(cached) $ECHO_C" >&6
     3742else
     3743  svn --version > confauto.out 2>&1
     3744                    if $EGREP https confauto.out >/dev/null 2>&1; then
     3745                      ac_cv_svn_understands_https=yes
     3746                    else
     3747                      ac_cv_svn_understands_https=no
     3748                      have_svn=no
     3749                      ac_cv_prog_have_svn=no
     3750                    fi
     3751                    rm -f confauto.out
     3752fi
     3753echo "$as_me:$LINENO: result: $ac_cv_svn_understands_https" >&5
     3754echo "${ECHO_T}$ac_cv_svn_understands_https" >&6
    36673755  fi
    36683756
     
    37213809
    37223810
     3811# AC_MSG_NOTICE([End automake initialisation.])
     3812
     3813
    37233814
    37243815#############################################################################
     
    37293820
    37303821case "$CXX" in
    3731   cl* | */cl*)
     3822  cl* | */cl* | CL* | */CL*)
    37323823    AMPLSOLVER_A=amplsolv.lib
    37333824    msvc_compile=yes ;;
     
    38343925
    38353926case "$CC" in
    3836   cl* | */cl* | CL* | */CL*) LIBEXT=lib ;;
     3927  cl* | */cl* | CL* | */CL*)
     3928       LIBEXT=lib ;;
    38373929    *) LIBEXT=a ;;
    38383930esac
  • ThirdParty/ASL/stable/1.0/configure.ac

    r147 r220  
    5151AC_COIN_PROG_CC
    5252
    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 
    57 
    5853# Initialize automake
    5954AC_COIN_INIT_AUTOMAKE
     
    6661AC_SUBST(AMPLSOLVER_A)
    6762case "$CXX" in
    68   cl* | */cl*)
     63  cl* | */cl* | CL* | */CL*)
    6964    AMPLSOLVER_A=amplsolv.lib
    7065    msvc_compile=yes ;;
Note: See TracChangeset for help on using the changeset viewer.