Changeset 1914


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

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/configure

    r1908 r1914  
    2392723927    if test "$CYGPATH_W" != "echo" ; then
    2392823928      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
    23929           cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
    23930         fi
     23929      cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     23930    fi
    2393123931    BLAS_CFLAGS="$cflags"
    2393223932    BLAS_LIBS=`$PKG_CONFIG --libs "coinblas" 2>/dev/null`
     
    2393523935        echo "$as_me:$LINENO: result: yes: $BLAS_VERSIONS" >&5
    2393623936echo "${ECHO_T}yes: $BLAS_VERSIONS" >&6
    23937         MUMPS_PCREQUIRES="coinblas $MUMPS_PCREQUIRES"
     23937
     23938        # adjust linker flags for (i)cl compiler
     23939        # 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)
     23940        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     23941        then
     23942          BLAS_LIBS=`echo " $BLAS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     23943        fi
     23944
     23945        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in MUMPS
     23946
     23947          MUMPS_PCREQUIRES="coinblas $MUMPS_PCREQUIRES"
     23948          MUMPS_CFLAGS="$BLAS_CFLAGS $MUMPS_CFLAGS"
     23949          MUMPS_LIBS="$BLAS_LIBS $MUMPS_LIBS"
    2393823950
    2393923951
     
    2395823970    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2395923971    export PKG_CONFIG_PATH
    23960 
    23961     # augment X_CFLAGS and X_LIBS for each build target X in MUMPS
    23962 
    23963       MUMPS_CFLAGS="$BLAS_CFLAGS $MUMPS_CFLAGS"
    23964       MUMPS_LIBS="$BLAS_LIBS $MUMPS_LIBS"
    2396523972
    2396623973  else
     
    2404624053        pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile`
    2404724054        eval `sh -c "$pcifilemod"`
     24055        if test "${CYGPATH_W}" != "echo"; then
     24056          projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`"
     24057        fi
    2404824058        BLAS_DATA_INSTALLED="$projdatadir"
    2404924059      fi
     
    2408624096
    2408724097    # set projcflags and projlibs variables by running $pcfilemod
     24098    projcflags=
     24099    projlibs=
    2408824100    eval `sh -c "$pcfilemod"`
    2408924101
    2409024102    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    24091     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24103    if test "${CYGPATH_W}" != "echo"; then
     24104      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24105    fi
    2409224106    BLAS_CFLAGS="$projcflags $BLAS_CFLAGS"
    2409324107
     
    2412724141
    2412824142    # set projcflags and projlibs variables by running $pcfilemod
     24143    projcflags=
     24144    projlibs=
    2412924145    eval `sh -c "$pcfilemod"`
    2413024146
    2413124147    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    24132     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24148    if test "${CYGPATH_W}" != "echo"; then
     24149      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24150    fi
    2413324151    BLAS_CFLAGS_INSTALLED="$projcflags $BLAS_CFLAGS_INSTALLED"
    2413424152
     
    2415224170_ACEOF
    2415324171
     24172
     24173  # adjust linker flags for (i)cl compiler
     24174  # 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),
     24175  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     24176  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     24177  #    everything of the form "-lname" by "libname.lib"
     24178  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     24179  then
     24180    BLAS_LIBS=`echo " $BLAS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     24181    BLAS_LIBS_INSTALLED=`echo " $BLAS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
     24182  fi
    2415424183
    2415524184
     
    2419324222  # construct dependencies variables from LIBS variables
    2419424223  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24195   BLAS_DEPENDENCIES=`echo " $BLAS_LIBS" | sed -e 's/ -[^ ]*//g'`
    24196 
    24197     MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS" | sed -e 's/ -[^ ]*//g'`
     24224  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     24225  BLAS_DEPENDENCIES=`echo " $BLAS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24226
     24227    MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2419824228
    2419924229
     
    2438724417    if test "$CYGPATH_W" != "echo" ; then
    2438824418      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
    24389           cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
    24390         fi
     24419      cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24420    fi
    2439124421    METIS_CFLAGS="$cflags"
    2439224422    METIS_LIBS=`$PKG_CONFIG --libs "coinmetis >= 4.0" 2>/dev/null`
     
    2439524425        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2439624426echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    24397         MUMPS_PCREQUIRES="coinmetis >= 4.0 $MUMPS_PCREQUIRES"
     24427
     24428        # adjust linker flags for (i)cl compiler
     24429        # 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)
     24430        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     24431        then
     24432          METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     24433        fi
     24434
     24435        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in MUMPS
     24436
     24437          MUMPS_PCREQUIRES="coinmetis >= 4.0 $MUMPS_PCREQUIRES"
     24438          MUMPS_CFLAGS="$METIS_CFLAGS $MUMPS_CFLAGS"
     24439          MUMPS_LIBS="$METIS_LIBS $MUMPS_LIBS"
    2439824440
    2439924441
     
    2441824460    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2441924461    export PKG_CONFIG_PATH
    24420 
    24421     # augment X_CFLAGS and X_LIBS for each build target X in MUMPS
    24422 
    24423       MUMPS_CFLAGS="$METIS_CFLAGS $MUMPS_CFLAGS"
    24424       MUMPS_LIBS="$METIS_LIBS $MUMPS_LIBS"
    2442524462
    2442624463  else
     
    2450624543        pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile`
    2450724544        eval `sh -c "$pcifilemod"`
     24545        if test "${CYGPATH_W}" != "echo"; then
     24546          projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`"
     24547        fi
    2450824548        METIS_DATA_INSTALLED="$projdatadir"
    2450924549      fi
     
    2454624586
    2454724587    # set projcflags and projlibs variables by running $pcfilemod
     24588    projcflags=
     24589    projlibs=
    2454824590    eval `sh -c "$pcfilemod"`
    2454924591
    2455024592    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    24551     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24593    if test "${CYGPATH_W}" != "echo"; then
     24594      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24595    fi
    2455224596    METIS_CFLAGS="$projcflags $METIS_CFLAGS"
    2455324597
     
    2458724631
    2458824632    # set projcflags and projlibs variables by running $pcfilemod
     24633    projcflags=
     24634    projlibs=
    2458924635    eval `sh -c "$pcfilemod"`
    2459024636
    2459124637    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    24592     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24638    if test "${CYGPATH_W}" != "echo"; then
     24639      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     24640    fi
    2459324641    METIS_CFLAGS_INSTALLED="$projcflags $METIS_CFLAGS_INSTALLED"
    2459424642
     
    2461224660_ACEOF
    2461324661
     24662
     24663  # adjust linker flags for (i)cl compiler
     24664  # 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),
     24665  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     24666  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     24667  #    everything of the form "-lname" by "libname.lib"
     24668  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     24669  then
     24670    METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     24671    METIS_LIBS_INSTALLED=`echo " $METIS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
     24672  fi
    2461424673
    2461524674
     
    2465324712  # construct dependencies variables from LIBS variables
    2465424713  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24655   METIS_DEPENDENCIES=`echo " $METIS_LIBS" | sed -e 's/ -[^ ]*//g'`
    24656 
    24657     MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS" | sed -e 's/ -[^ ]*//g'`
     24714  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     24715  METIS_DEPENDENCIES=`echo " $METIS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24716
     24717    MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2465824718
    2465924719
Note: See TracChangeset for help on using the changeset viewer.