eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linker problem fix with Linux

Browse source
This commit is contained in:
Volker Fischer 2008-01-27 12:45:09 +00:00
parent d39cb59c03
commit 9b79f7368e
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.in
View file

@ -46,17 +46,20 @@ AC_LANG(C++)
dnl QT4 ------------------------------------------------------------------------- dnl QT4 -------------------------------------------------------------------------
dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu
PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork QtXml >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
if test "x$HAVE_QT4" = "xyes"; then if test "x$HAVE_QT4" = "xyes"; then
dnl Check needed because in some cases the QtGui includedir dnl Check needed because in some cases the QtGui includedir
dnl doesn't contain the subsystem dir. dnl doesn't contain the subsystem dir.
QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui) QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget], AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]), AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget], AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR", QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
AC_MSG_WARN([QWidget not found]))) AC_MSG_WARN([QWidget not found])))
AC_CHECK_PROGS(QT_MOC, [moc4 moc-qt4 moc], []) AC_CHECK_PROGS(QT_MOC, [moc4 moc-qt4 moc], [])
AC_CHECK_PROGS(QT_RCC, [rcc4 rcc-qt4 rcc], []) AC_CHECK_PROGS(QT_RCC, [rcc4 rcc-qt4 rcc], [])
AC_CHECK_PROGS(QT_UIC, [uic4 uic-qt4 uic], []) AC_CHECK_PROGS(QT_UIC, [uic4 uic-qt4 uic], [])
@ -69,13 +72,20 @@ if test "x$HAVE_QT4" = "xyes"; then
if (test "$QT_UIC" = ""); then if (test "$QT_UIC" = ""); then
AC_MSG_ERROR([QT4 uic is required.]) AC_MSG_ERROR([QT4 uic is required.])
fi fi
QT_LIB="-lQtCore -lQtGui -lQtNetwork -lQtXml"
fi fi
QT_LIBS="$QT_LIB"
QT_LDADD="-L$QTDIR/lib $QT_LIBS"
LDFLAGS="$QT_LDADD $LDFLAGS"
dnl FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'` dnl FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'`
dnl LDFLAGS="$LDFLAGS $FOO" dnl LDFLAGS="$LDFLAGS $FOO"
LDFLAGS="-L/usr/lib $LDFLAGS" dnl LDFLAGS="-L/usr/lib $QT_LIBS $LDFLAGS"
dnl AC_MSG_NOTICE([Set LDFLAGS... $LDFLAGS]) AC_MSG_NOTICE([Set LDFLAGS... $LDFLAGS])
AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS]) AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
AC_SUBST(QT_CFLAGS) AC_SUBST(QT_CFLAGS)