Skip to content

Commit

Permalink
- Configure with static Coin/SoQt
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9618 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Aug 9, 2011
1 parent aa65adb commit 9b214bb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
11 changes: 8 additions & 3 deletions configure
Expand Up @@ -1342,7 +1342,7 @@ Optional Packages:
--with-qwt Compile plotting libraries using qwt. Default searches PREFIX/include/{qwt,qwt-qt4}
--with-paradiseo Required for OMOptim. Default searches {PREFIX,/usr,/opt} for {include,lib}/paradiseo
--with-sendData-Qt Compile with support for plot().
--with-Coin Compile with support for plotting in 3D.
--with-Coin=yes|no|static Compile with support for plotting in 3D.
--with-MODPAR Compile with automatic parallelization, requires boost
--with-BOOST=DIR With BOOST library in DIR
Expand Down Expand Up @@ -5291,12 +5291,17 @@ if test "${with_Coin+set}" = set; then :
if test -z "$QMAKE"; then
as_fn_error $? "\"Cannot compile with libCoin unless qmake is present.\"" "$LINENO" 5 ;
fi
COIN_LIBS=`coin-config --ldflags --libs | tr \\\\n \\ `
#Would be duplicated by soqt-libs...
#COIN_LIBS=`coin-config --ldflags --libs | tr \\\\n \\ `
SOQT_LIBS=`soqt-config --ldflags --libs | tr \\\\n \\ `
COIN_INCLUDE=`coin-config --includedir | tr \\\\n \\ `
SOQT_INCLUDE=`soqt-config --includedir | tr \\\\n \\ `
HAVE_COIN="HAVE_COIN"
if test -z "$COIN_INCLUDE" || test -z "$SOQT_INCLUDE" || test -z "$COIN_LIBS" || test -z "$SOQT_LIBS"; then
if test "$withval" = "static" ; then
SOQT_LIBS=`echo $SOQT_LIBS | sed "s/-lCoin/-Wl,-Bstatic -lCoin -Wl,-Bdynamic/"`
SOQT_LIBS=`echo $SOQT_LIBS | sed "s/-lSoQt4/-Wl,-Bstatic -lSoQt4 -Wl,-Bdynamic/"`
fi
if test -z "$COIN_INCLUDE" || test -z "$SOQT_INCLUDE" || test -z "$SOQT_LIBS"; then
as_fn_error $? "failure" "$LINENO" 5 ;
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
Expand Down
11 changes: 8 additions & 3 deletions configure.in
Expand Up @@ -459,17 +459,22 @@ fi
dnl Check for libCoin

AC_MSG_CHECKING([for libCoin])
AC_ARG_WITH(Coin, [ --with-Coin Compile with support for plotting in 3D.],
AC_ARG_WITH(Coin, [ --with-Coin=[yes|no|static] Compile with support for plotting in 3D.],
[
if test -z "$QMAKE"; then
AC_MSG_ERROR("Cannot compile with libCoin unless qmake is present.");
fi
COIN_LIBS=`coin-config --ldflags --libs | tr \\\\n \\ `
#Would be duplicated by soqt-libs...
#COIN_LIBS=`coin-config --ldflags --libs | tr \\\\n \\ `
SOQT_LIBS=`soqt-config --ldflags --libs | tr \\\\n \\ `
COIN_INCLUDE=`coin-config --includedir | tr \\\\n \\ `
SOQT_INCLUDE=`soqt-config --includedir | tr \\\\n \\ `
HAVE_COIN="HAVE_COIN"
if test -z "$COIN_INCLUDE" || test -z "$SOQT_INCLUDE" || test -z "$COIN_LIBS" || test -z "$SOQT_LIBS"; then
if test "$withval" = "static" ; then
SOQT_LIBS=`echo $SOQT_LIBS | sed "s/-lCoin/-Wl,-Bstatic -lCoin -Wl,-Bdynamic/"`
SOQT_LIBS=`echo $SOQT_LIBS | sed "s/-lSoQt4/-Wl,-Bstatic -lSoQt4 -Wl,-Bdynamic/"`
fi
if test -z "$COIN_INCLUDE" || test -z "$SOQT_INCLUDE" || test -z "$SOQT_LIBS"; then
AC_MSG_ERROR([failure]);
fi
AC_MSG_RESULT([ok])
Expand Down

0 comments on commit 9b214bb

Please sign in to comment.