Changeset 1488 for stable


Ignore:
Timestamp:
Dec 31, 2009 2:40:01 PM (10 years ago)
Author:
stefan
Message:

rerun autotools and fix data paths in test/Makefile for cygwin

Location:
stable/BSPsplit/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/Clp/configure

    r1487 r1488  
    2060520605  withval="$with_coinutils_incdir"
    2060620606  coin_has_coinutils=yes
    20607      COINUTILS_CFLAGS="-I$withval"
     20607     COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
    2060820608fi;
    2060920609
     
    2066520665  if $PKG_CONFIG --exists "coinutils = 2.5BSPsplit"; then
    2066620666    COINUTILS_VERSIONS="`$PKG_CONFIG --modversion coinutils = 2.5BSPsplit 2>/dev/null`"
    20667      COINUTILS_CFLAGS=`$PKG_CONFIG --cflags "coinutils = 2.5BSPsplit" 2>/dev/null`
     20667     cflags=`$PKG_CONFIG --cflags "coinutils = 2.5BSPsplit" 2>/dev/null`
     20668    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     20669        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     20670        # but only do this if is not trivial
     20671    if test "$CYGPATH_W" != "echo" ; then
     20672      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     20673          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     20674        fi
     20675    COINUTILS_CFLAGS="$cflags"
    2066820676    COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils = 2.5BSPsplit" 2>/dev/null`
    2066920677    COINUTILS_DATA=`$PKG_CONFIG --variable=datadir "coinutils = 2.5BSPsplit" 2>/dev/null`
     
    2078620794  withval="$with_sample_incdir"
    2078720795  coin_has_sample=yes
    20788      SAMPLE_CFLAGS="-I$withval"
     20796     SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
    2078920797fi;
    2079020798
     
    2084620854  if $PKG_CONFIG --exists "sample"; then
    2084720855    SAMPLE_VERSIONS="`$PKG_CONFIG --modversion sample 2>/dev/null`"
    20848      SAMPLE_CFLAGS=`$PKG_CONFIG --cflags "sample" 2>/dev/null`
     20856     cflags=`$PKG_CONFIG --cflags "sample" 2>/dev/null`
     20857    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     20858        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     20859        # but only do this if is not trivial
     20860    if test "$CYGPATH_W" != "echo" ; then
     20861      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     20862          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     20863        fi
     20864    SAMPLE_CFLAGS="$cflags"
    2084920865    SAMPLE_LIBS=`$PKG_CONFIG --libs "sample" 2>/dev/null`
    2085020866    SAMPLE_DATA=`$PKG_CONFIG --variable=datadir "sample" 2>/dev/null`
     
    2096720983  withval="$with_netlib_incdir"
    2096820984  coin_has_netlib=yes
    20969      NETLIB_CFLAGS="-I$withval"
     20985     NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
    2097020986fi;
    2097120987
     
    2102721043  if $PKG_CONFIG --exists "netlib"; then
    2102821044    NETLIB_VERSIONS="`$PKG_CONFIG --modversion netlib 2>/dev/null`"
    21029      NETLIB_CFLAGS=`$PKG_CONFIG --cflags "netlib" 2>/dev/null`
     21045     cflags=`$PKG_CONFIG --cflags "netlib" 2>/dev/null`
     21046    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     21047        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     21048        # but only do this if is not trivial
     21049    if test "$CYGPATH_W" != "echo" ; then
     21050      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     21051          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     21052        fi
     21053    NETLIB_CFLAGS="$cflags"
    2103021054    NETLIB_LIBS=`$PKG_CONFIG --libs "netlib" 2>/dev/null`
    2103121055    NETLIB_DATA=`$PKG_CONFIG --variable=datadir "netlib" 2>/dev/null`
  • stable/BSPsplit/Clp/test/Makefile.am

    r1465 r1488  
    1515unittestflags =
    1616if COIN_HAS_SAMPLE
    17   unittestflags += -dirSample $(SAMPLE_DATA)
     17  unittestflags += -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    1818endif
    1919unittestflags += -unitTest
    2020if COIN_HAS_NETLIB
    21   unittestflags += -dirNetlib $(NETLIB_DATA) -netlib
     21  unittestflags += -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
    2222endif
    2323
  • stable/BSPsplit/Clp/test/Makefile.in

    r1465 r1488  
    4242build_triplet = @build@
    4343host_triplet = @host@
    44 @COIN_HAS_SAMPLE_TRUE@am__append_1 = -dirSample $(SAMPLE_DATA)
    45 @COIN_HAS_NETLIB_TRUE@am__append_2 = -dirNetlib $(NETLIB_DATA) -netlib
     44@COIN_HAS_SAMPLE_TRUE@am__append_1 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     45@COIN_HAS_NETLIB_TRUE@am__append_2 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
    4646subdir = test
    4747DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
Note: See TracChangeset for help on using the changeset viewer.