Changeset 1648 for trunk/Clp


Ignore:
Timestamp:
Dec 5, 2010 3:44:10 PM (9 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1647 r1648  
    2083020830        echo "$as_me:$LINENO: result: yes: $COINUTILS_VERSIONS" >&5
    2083120831echo "${ECHO_T}yes: $COINUTILS_VERSIONS" >&6
    20832         CLPLIB_PCREQUIRES="coinutils $CLPLIB_PCREQUIRES"
     20832
     20833        # adjust linker flags for (i)cl compiler
     20834        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     20835        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     20836        then
     20837          COINUTILS_LIBS=`echo " $COINUTILS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     20838        fi
     20839
     20840        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in ClpLib
     20841
     20842          CLPLIB_PCREQUIRES="coinutils $CLPLIB_PCREQUIRES"
     20843          CLPLIB_CFLAGS="$COINUTILS_CFLAGS $CLPLIB_CFLAGS"
     20844          CLPLIB_LIBS="$COINUTILS_LIBS $CLPLIB_LIBS"
    2083320845
    2083420846
     
    2085320865    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2085420866    export PKG_CONFIG_PATH
    20855 
    20856     # augment X_CFLAGS and X_LIBS for each build target X in ClpLib
    20857 
    20858       CLPLIB_CFLAGS="$COINUTILS_CFLAGS $CLPLIB_CFLAGS"
    20859       CLPLIB_LIBS="$COINUTILS_LIBS $CLPLIB_LIBS"
    2086020867
    2086120868  else
     
    2106021067
    2106121068  # adjust linker flags for (i)cl compiler
     21069  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     21070  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     21071  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     21072  #    everything of the form "-lname" by "libname.lib"
    2106221073  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2106321074  then
     21075    COINUTILS_LIBS=`echo " $COINUTILS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2106421076    COINUTILS_LIBS_INSTALLED=`echo " $COINUTILS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
    2106521077  fi
     
    2110521117  # construct dependencies variables from LIBS variables
    2110621118  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21107   COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ -[^ ]*//g'`
    21108 
    21109     CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS" | sed -e 's/ -[^ ]*//g'`
     21119  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     21120  COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21121
     21122    CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2111021123
    2111121124
     
    2126121274        echo "$as_me:$LINENO: result: yes: $OSI_VERSIONS" >&5
    2126221275echo "${ECHO_T}yes: $OSI_VERSIONS" >&6
    21263         OSICLPLIB_PCREQUIRES="osi $OSICLPLIB_PCREQUIRES"
     21276
     21277        # adjust linker flags for (i)cl compiler
     21278        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     21279        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     21280        then
     21281          OSI_LIBS=`echo " $OSI_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     21282        fi
     21283
     21284        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in OsiClpLib
     21285
     21286          OSICLPLIB_PCREQUIRES="osi $OSICLPLIB_PCREQUIRES"
     21287          OSICLPLIB_CFLAGS="$OSI_CFLAGS $OSICLPLIB_CFLAGS"
     21288          OSICLPLIB_LIBS="$OSI_LIBS $OSICLPLIB_LIBS"
    2126421289
    2126521290
     
    2128421309    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2128521310    export PKG_CONFIG_PATH
    21286 
    21287     # augment X_CFLAGS and X_LIBS for each build target X in OsiClpLib
    21288 
    21289       OSICLPLIB_CFLAGS="$OSI_CFLAGS $OSICLPLIB_CFLAGS"
    21290       OSICLPLIB_LIBS="$OSI_LIBS $OSICLPLIB_LIBS"
    2129121311
    2129221312  else
     
    2149121511
    2149221512  # adjust linker flags for (i)cl compiler
     21513  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     21514  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     21515  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     21516  #    everything of the form "-lname" by "libname.lib"
    2149321517  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2149421518  then
     21519    OSI_LIBS=`echo " $OSI_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2149521520    OSI_LIBS_INSTALLED=`echo " $OSI_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
    2149621521  fi
     
    2153621561  # construct dependencies variables from LIBS variables
    2153721562  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21538   OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ -[^ ]*//g'`
    21539 
    21540     OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS" | sed -e 's/ -[^ ]*//g'`
     21563  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     21564  OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21565
     21566    OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2154121567
    2154221568
     
    2167621702echo "${ECHO_T}yes: $OSITESTS_VERSIONS" >&6
    2167721703
     21704        # adjust linker flags for (i)cl compiler
     21705        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     21706        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     21707        then
     21708          OSITESTS_LIBS=`echo " $OSITESTS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     21709        fi
     21710
     21711        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     21712
    2167821713
    2167921714
     
    2169721732    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2169821733    export PKG_CONFIG_PATH
    21699 
    21700     # augment X_CFLAGS and X_LIBS for each build target X in
    2170121734
    2170221735  else
     
    2190121934
    2190221935  # adjust linker flags for (i)cl compiler
     21936  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     21937  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     21938  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     21939  #    everything of the form "-lname" by "libname.lib"
    2190321940  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2190421941  then
     21942    OSITESTS_LIBS=`echo " $OSITESTS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2190521943    OSITESTS_LIBS_INSTALLED=`echo " $OSITESTS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
    2190621944  fi
     
    2194021978  # construct dependencies variables from LIBS variables
    2194121979  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21942   OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ -[^ ]*//g'`
     21980  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     21981  OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2194321982
    2194421983
     
    2207122110echo "${ECHO_T}yes: $SAMPLE_VERSIONS" >&6
    2207222111
     22112        # adjust linker flags for (i)cl compiler
     22113        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     22114        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     22115        then
     22116          SAMPLE_LIBS=`echo " $SAMPLE_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     22117        fi
     22118
     22119        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     22120
    2207322121
    2207422122
     
    2209222140    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2209322141    export PKG_CONFIG_PATH
    22094 
    22095     # augment X_CFLAGS and X_LIBS for each build target X in
    2209622142
    2209722143  else
     
    2229622342
    2229722343  # adjust linker flags for (i)cl compiler
     22344  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     22345  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     22346  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     22347  #    everything of the form "-lname" by "libname.lib"
    2229822348  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2229922349  then
     22350    SAMPLE_LIBS=`echo " $SAMPLE_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2230022351    SAMPLE_LIBS_INSTALLED=`echo " $SAMPLE_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
    2230122352  fi
     
    2233522386  # construct dependencies variables from LIBS variables
    2233622387  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22337   SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ -[^ ]*//g'`
     22388  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22389  SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2233822390
    2233922391
     
    2246622518echo "${ECHO_T}yes: $NETLIB_VERSIONS" >&6
    2246722519
     22520        # adjust linker flags for (i)cl compiler
     22521        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     22522        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     22523        then
     22524          NETLIB_LIBS=`echo " $NETLIB_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     22525        fi
     22526
     22527        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     22528
    2246822529
    2246922530
     
    2248722548    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2248822549    export PKG_CONFIG_PATH
    22489 
    22490     # augment X_CFLAGS and X_LIBS for each build target X in
    2249122550
    2249222551  else
     
    2269122750
    2269222751  # adjust linker flags for (i)cl compiler
     22752  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     22753  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     22754  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     22755  #    everything of the form "-lname" by "libname.lib"
    2269322756  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2269422757  then
     22758    NETLIB_LIBS=`echo " $NETLIB_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2269522759    NETLIB_LIBS_INSTALLED=`echo " $NETLIB_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
    2269622760  fi
     
    2273022794  # construct dependencies variables from LIBS variables
    2273122795  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22732   NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ -[^ ]*//g'`
     22796  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22797  NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2273322798
    2273422799
Note: See TracChangeset for help on using the changeset viewer.