Author: durner
Date: 2008-03-09 09:33:28 -0600 (Sun, 09 Mar 2008)
New Revision: 6550
Modified:
GNUnet/configure.ac
Log:
fix MinGW
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2008-03-09 14:02:56 UTC (rev 6549)
+++ GNUnet/configure.ac 2008-03-09 15:33:28 UTC (rev 6550)
@@ -169,7 +169,7 @@
AC_PROG_CXX
LIBPREFIX=lib
DLLDIR=bin
- QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32
-lqtmain -lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s
-Wl,-subsystem,windows"
+ QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lqtmain
-lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s
-Wl,-subsystem,windows"
QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui
-I$QTDIR/include/QtOpenGL -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL
-DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT
-DQT_NEEDS_QMAIN -frtti -fexceptions"
QTBIN="$QTDIR/bin"
;;
@@ -508,7 +508,7 @@
;;
yes)
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
qt=1))
;;
*)
@@ -517,7 +517,7 @@
QTINC="$QTINC -I$with_qt/include -I$with_qt/include/qt4"
CPPFLAGS="$QTINC $CPPFLAGS"
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
qt=1))
;;
@@ -529,7 +529,7 @@
QTINC="$QTINC -I/usr/include -I/usr/include/qt4"
CPPFLAGS="$QTINC $CPPFLAGS"
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
qt=1))])
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
