Changeset 2100


Ignore:
Timestamp:
Jan 28, 2011 1:29:11 PM (9 years ago)
Author:
stefan
Message:

merge chgset 2099 from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6/coin.m4

    r2092 r2100  
    40114011         m4_toupper(myvar)_LIBS="$withval $m4_toupper(myvar)_LIBS"
    40124012       ])
     4013       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     4014       if test -z "$PKG_CONFIG" ; then
     4015         m4_toupper($1_LIBS_INSTALLED)="$withval"
     4016         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_LIBS_INSTALLED="$withval $m4_toupper(myvar)_LIBS_INSTALLED"])
     4017       fi
    40134018      ],
    40144019      [])
     
    40204025     m4_toupper($1_CFLAGS)="-I`${CYGPATH_W} $withval`"
    40214026     coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="$withval $m4_toupper(myvar)_CFLAGS"
     4027     coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="-I`${CYGPATH_W} $withval` $m4_toupper(myvar)_CFLAGS"])
     4028     # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     4029     if test -z "$PKG_CONFIG" ; then
     4030       m4_toupper($1_CFLAGS_INSTALLED)="$m4_toupper($1_CFLAGS)"
     4031       coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS_INSTALLED="$m4_toupper($1_CFLAGS) $m4_toupper(myvar)_CFLAGS_INSTALLED"])
     4032     fi
    40224033     ])
    40234034    ],
     
    40284039                   [directory with data files for using package $1]),
    40294040    [m4_tolower(coin_has_$1)=yes
    4030      m4_toupper($1_DATA)="$withval"],
     4041     m4_toupper($1_DATA)="$withval"
     4042     # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     4043     if test -z "$PKG_CONFIG" ; then
     4044       m4_toupper($1_DATA_INSTALLED)="$withval"
     4045     fi
     4046    ],
    40314047    [])
    40324048fi
Note: See TracChangeset for help on using the changeset viewer.