Changeset 3059


Ignore:
Timestamp:
Nov 9, 2013 10:23:59 AM (6 years ago)
Author:
stefan
Message:

add missing Glpk argument to AC_COIN_CHECK_LIBM (see #105:9)

Location:
ThirdParty/Glpk/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/configure

    r3056 r3059  
    27502750    fi ;;
    27512751  * )
    2752     CYGPATH_W=echo
     2752    if test x"$CYGPATH_W" = x ; then
     2753      CYGPATH_W=echo
     2754    fi
    27532755    ;;
    27542756esac
     
    50025004*-*-irix6*)
    50035005  # Find out which ABI we are using.
    5004   echo '#line 5004 "configure"' > conftest.$ac_ext
     5006  echo '#line 5006 "configure"' > conftest.$ac_ext
    50055007  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    50065008  (eval $ac_compile) 2>&5
     
    66016603
    66026604# Provide some information about the compiler.
    6603 echo "$as_me:6603:" \
     6605echo "$as_me:6605:" \
    66046606     "checking for Fortran 77 compiler version" >&5
    66056607ac_compiler=`set X $ac_compile; echo $2`
     
    76687670   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76697671   -e 's:$: $lt_compiler_flag:'`
    7670    (eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
     7672   (eval echo "\"\$as_me:7672: $lt_compile\"" >&5)
    76717673   (eval "$lt_compile" 2>conftest.err)
    76727674   ac_status=$?
    76737675   cat conftest.err >&5
    7674    echo "$as_me:7674: \$? = $ac_status" >&5
     7676   echo "$as_me:7676: \$? = $ac_status" >&5
    76757677   if (exit $ac_status) && test -s "$ac_outfile"; then
    76767678     # The compiler can only warn and ignore the option if not recognized
     
    79367938   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79377939   -e 's:$: $lt_compiler_flag:'`
    7938    (eval echo "\"\$as_me:7938: $lt_compile\"" >&5)
     7940   (eval echo "\"\$as_me:7940: $lt_compile\"" >&5)
    79397941   (eval "$lt_compile" 2>conftest.err)
    79407942   ac_status=$?
    79417943   cat conftest.err >&5
    7942    echo "$as_me:7942: \$? = $ac_status" >&5
     7944   echo "$as_me:7944: \$? = $ac_status" >&5
    79437945   if (exit $ac_status) && test -s "$ac_outfile"; then
    79447946     # The compiler can only warn and ignore the option if not recognized
     
    80408042   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80418043   -e 's:$: $lt_compiler_flag:'`
    8042    (eval echo "\"\$as_me:8042: $lt_compile\"" >&5)
     8044   (eval echo "\"\$as_me:8044: $lt_compile\"" >&5)
    80438045   (eval "$lt_compile" 2>out/conftest.err)
    80448046   ac_status=$?
    80458047   cat out/conftest.err >&5
    8046    echo "$as_me:8046: \$? = $ac_status" >&5
     8048   echo "$as_me:8048: \$? = $ac_status" >&5
    80478049   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80488050   then
     
    1038510387  lt_status=$lt_dlunknown
    1038610388  cat > conftest.$ac_ext <<EOF
    10387 #line 10387 "configure"
     10389#line 10389 "configure"
    1038810390#include "confdefs.h"
    1038910391
     
    1048510487  lt_status=$lt_dlunknown
    1048610488  cat > conftest.$ac_ext <<EOF
    10487 #line 10487 "configure"
     10489#line 10489 "configure"
    1048810490#include "confdefs.h"
    1048910491
     
    1282912831   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1283012832   -e 's:$: $lt_compiler_flag:'`
    12831    (eval echo "\"\$as_me:12831: $lt_compile\"" >&5)
     12833   (eval echo "\"\$as_me:12833: $lt_compile\"" >&5)
    1283212834   (eval "$lt_compile" 2>conftest.err)
    1283312835   ac_status=$?
    1283412836   cat conftest.err >&5
    12835    echo "$as_me:12835: \$? = $ac_status" >&5
     12837   echo "$as_me:12837: \$? = $ac_status" >&5
    1283612838   if (exit $ac_status) && test -s "$ac_outfile"; then
    1283712839     # The compiler can only warn and ignore the option if not recognized
     
    1293312935   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1293412936   -e 's:$: $lt_compiler_flag:'`
    12935    (eval echo "\"\$as_me:12935: $lt_compile\"" >&5)
     12937   (eval echo "\"\$as_me:12937: $lt_compile\"" >&5)
    1293612938   (eval "$lt_compile" 2>out/conftest.err)
    1293712939   ac_status=$?
    1293812940   cat out/conftest.err >&5
    12939    echo "$as_me:12939: \$? = $ac_status" >&5
     12941   echo "$as_me:12941: \$? = $ac_status" >&5
    1294012942   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1294112943   then
     
    1450314505   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1450414506   -e 's:$: $lt_compiler_flag:'`
    14505    (eval echo "\"\$as_me:14505: $lt_compile\"" >&5)
     14507   (eval echo "\"\$as_me:14507: $lt_compile\"" >&5)
    1450614508   (eval "$lt_compile" 2>conftest.err)
    1450714509   ac_status=$?
    1450814510   cat conftest.err >&5
    14509    echo "$as_me:14509: \$? = $ac_status" >&5
     14511   echo "$as_me:14511: \$? = $ac_status" >&5
    1451014512   if (exit $ac_status) && test -s "$ac_outfile"; then
    1451114513     # The compiler can only warn and ignore the option if not recognized
     
    1460714609   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1460814610   -e 's:$: $lt_compiler_flag:'`
    14609    (eval echo "\"\$as_me:14609: $lt_compile\"" >&5)
     14611   (eval echo "\"\$as_me:14611: $lt_compile\"" >&5)
    1461014612   (eval "$lt_compile" 2>out/conftest.err)
    1461114613   ac_status=$?
    1461214614   cat out/conftest.err >&5
    14613    echo "$as_me:14613: \$? = $ac_status" >&5
     14615   echo "$as_me:14615: \$? = $ac_status" >&5
    1461414616   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1461514617   then
     
    1681416816   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1681516817   -e 's:$: $lt_compiler_flag:'`
    16816    (eval echo "\"\$as_me:16816: $lt_compile\"" >&5)
     16818   (eval echo "\"\$as_me:16818: $lt_compile\"" >&5)
    1681716819   (eval "$lt_compile" 2>conftest.err)
    1681816820   ac_status=$?
    1681916821   cat conftest.err >&5
    16820    echo "$as_me:16820: \$? = $ac_status" >&5
     16822   echo "$as_me:16822: \$? = $ac_status" >&5
    1682116823   if (exit $ac_status) && test -s "$ac_outfile"; then
    1682216824     # The compiler can only warn and ignore the option if not recognized
     
    1708217084   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1708317085   -e 's:$: $lt_compiler_flag:'`
    17084    (eval echo "\"\$as_me:17084: $lt_compile\"" >&5)
     17086   (eval echo "\"\$as_me:17086: $lt_compile\"" >&5)
    1708517087   (eval "$lt_compile" 2>conftest.err)
    1708617088   ac_status=$?
    1708717089   cat conftest.err >&5
    17088    echo "$as_me:17088: \$? = $ac_status" >&5
     17090   echo "$as_me:17090: \$? = $ac_status" >&5
    1708917091   if (exit $ac_status) && test -s "$ac_outfile"; then
    1709017092     # The compiler can only warn and ignore the option if not recognized
     
    1718617188   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1718717189   -e 's:$: $lt_compiler_flag:'`
    17188    (eval echo "\"\$as_me:17188: $lt_compile\"" >&5)
     17190   (eval echo "\"\$as_me:17190: $lt_compile\"" >&5)
    1718917191   (eval "$lt_compile" 2>out/conftest.err)
    1719017192   ac_status=$?
    1719117193   cat out/conftest.err >&5
    17192    echo "$as_me:17192: \$? = $ac_status" >&5
     17194   echo "$as_me:17194: \$? = $ac_status" >&5
    1719317195   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1719417196   then
     
    1988519887    # Here we need to check if -m32 is specified.  If so, we need to correct
    1988619888    # sys_lib_search_path_spec
     19889    *-cygwin* | *-mingw*)
     19890       case "$CXX" in
     19891    clang* )
     19892      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     19893      { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
     19894echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
     19895      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19896          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19897          -e 's|libext="lib"|libext="a"|' \
     19898      libtool > conftest.bla
     19899      ;;
     19900    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     19901      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     19902echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     19903      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19904          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19905          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19906          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19907          -e 's%lib /OUT:%lib -OUT:%' \
     19908          -e "s%cygpath -w%$CYGPATH_W%" \
     19909          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\$(lib -nologo -list \\$('"$CYGPATH_W \$1"') '"$mydos2unix"' | xargs echo); echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$('"$CYGPATH_W \$1"'); done%' \
     19910          -e 's%$AR t "$f_ex_an_ar_oldlib"%lib -nologo -list \$('"$CYGPATH_W \$1"') '"$mydos2unix"'%' \
     19911          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     19912          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     19913          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     19914      libtool > conftest.bla
     19915      ;;
     19916    *)
     19917      { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
     19918echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
     19919      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19920          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19921          -e 's|libext="lib"|libext="a"|' \
     19922      libtool > conftest.bla
     19923      ;;
     19924  esac
     19925  mv conftest.bla libtool
     19926  chmod 755 libtool
     19927
     19928      ;;
    1988719929    *x86_64-*)
    1988819930      if test "$GCC" = yes && (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm32' >& /dev/null); then
     
    1992419966      ;;
    1992519967    # Cygwin. Ah, cygwin. Too big and ugly to inline; see the macro.
    19926     *-cygwin* | *-mingw*)
    19927        case "$CXX" in
    19928     clang* )
    19929       # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
    19930       { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
    19931 echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
    19932       sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19933           -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    19934           -e 's|libext="lib"|libext="a"|' \
    19935       libtool > conftest.bla
    19936       ;;
    19937     cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19938       { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    19939 echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
    19940       sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19941           -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19942           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    19943           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    19944           -e 's%lib /OUT:%lib -OUT:%' \
    19945           -e "s%cygpath -w%$CYGPATH_W%" \
    19946           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\$(lib -nologo -list \\$('"$CYGPATH_W \$1"') '"$mydos2unix"' | xargs echo); echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$('"$CYGPATH_W \$1"'); done%' \
    19947           -e 's%$AR t "$f_ex_an_ar_oldlib"%lib -nologo -list \$('"$CYGPATH_W \$1"') '"$mydos2unix"'%' \
    19948           -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    19949           -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    19950           -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    19951       libtool > conftest.bla
    19952       ;;
    19953     *)
    19954       { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
    19955 echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
    19956       sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19957           -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    19958           -e 's|libext="lib"|libext="a"|' \
    19959       libtool > conftest.bla
    19960       ;;
    19961   esac
    19962   mv conftest.bla libtool
    19963   chmod 755 libtool
    19964 
    19965       ;;
    1996619968    *-darwin*)
    1996719969      { echo "$as_me:$LINENO: Applying patches to libtool for Darwin" >&5
     
    2048820490
    2048920491if test $coin_cc_is_cl != true ; then
     20492
     20493    GLPK_LIBS="-lm $GLPK_LIBS"
     20494    GLPK_PCLIBS="-lm $GLPK_PCLIBS"
     20495    GLPK_LIBS_INSTALLED="-lm $GLPK_LIBS_INSTALLED"
    2049020496
    2049120497fi
  • ThirdParty/Glpk/trunk/configure.ac

    r3056 r3059  
    8383AC_LANG_POP(C)
    8484
    85 AC_COIN_CHECK_LIBM
     85AC_COIN_CHECK_LIBM(Glpk)
    8686
    8787###########################################################################
Note: See TracChangeset for help on using the changeset viewer.