[GNUnet-SVN] r8234

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8234 - gnunet-qt

From:	gnunet
Subject:	[GNUnet-SVN] r8234 - gnunet-qt
Date:	Sat, 14 Feb 2009 02:49:08 -0700 (MST)
Author: holindho
Date: 2009-02-14 02:49:08 -0700 (Sat, 14 Feb 2009)
New Revision: 8234

Modified:
   gnunet-qt/configure.ac
Log:
Qt check that works on the Mac


Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac      2009-02-14 05:11:38 UTC (rev 8233)
+++ gnunet-qt/configure.ac      2009-02-14 09:49:08 UTC (rev 8234)
@@ -44,54 +44,54 @@
      AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
      CFLAGS="-no-cpp-precomp $CFLAGS"
      LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
-     QTLIBS="-L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore $X_LIBS -lX11 -lXext 
-lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
       ;;
 linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
      CFLAGS="-D_THREAD_SAFE $CFLAGS"
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 openbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
      LIBS=`echo $LIBS | sed -e "s/-ldl//"`
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 netbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
      LIBPREFIX=
      DLLDIR=lib
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 *solaris*)
      AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
      AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 *arm-linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
      CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
-     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
-     QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL 
-lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL 
-lpthread"
+     DEFAULT_QTINC="-I$QTDIR/include/qt4 -I$QTDIR/include/qt4/QtGui 
-I$QTDIR/include/qt4/QtCore -I$QTDIR/include/qt4/QtOpenGL $X_CFLAGS 
-DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 *cygwin*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -99,9 +99,9 @@
      LDFLAGS="$LDFLAGS -no-undefined"
      CFLAGS="-mms-bitfields $CFLAGS"
      AC_PROG_CXX
-     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,-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"
+     DEFAULT_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,-subsystem,windows"
+     DEFAULT_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"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 *mingw*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
@@ -110,9 +110,9 @@
      LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc"
      CFLAGS="-mms-bitfields $CFLAGS"
-     QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lQtOpenGL4 
-lQtGui4 -lQtCore4"
-     QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui 
-I$QTDIR/include/QtOpenGL"
-     QTBIN="$QTDIR/bin"
+     DEFAULT_QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 
-lQtOpenGL4 -lQtGui4 -lQtCore4"
+     DEFAULT_QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtGui -I$QTDIR/include/QtOpenGL"
+     DEFAULT_QTBIN="$QTDIR/bin"
      ;;
 *)
      AC_MSG_RESULT(Unrecognised OS $host_os)
@@ -238,6 +238,19 @@
 # check for Qt 4 (yucky)
 AC_LANG_PUSH([C++])
 AC_MSG_CHECKING(for Qt)
+if test -z "${QTBIN}" ; then
+  QTBIN="$DEFAULT_QTBIN"
+fi
+if test -z "${QTLIBS}" ; then
+  QTINC="$DEFAULT_QTINC"
+  QTLIBS="$DEFAULT_QTLIBS"
+  if ( pkg-config --help > /dev/null 2> /dev/null ) ; then
+    if ( pkg-config --cflags QtCore && pkg-config --libs QtCore && pkg-config 
--cflags QtGui && pkg-config --libs QtGui ) ; then
+      QTINC="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui`"
+      QTLIBS="`pkg-config --libs QtCore` `pkg-config --libs QtGui`"
+    fi
+  fi
+fi
 LDFLAGS="$QTLIBS $LDFLAGS"
 INCLUDES="$INCLUDES $QTINC"
 CPPFLAGS="$QTINC $CPPFLAGS"
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r8234 - gnunet-qt, gnunet <=
Prev by Date: [GNUnet-SVN] r8233 - libmicrohttpd/m4
Next by Date: [GNUnet-SVN] r8235 - GNUnet-docs/WWW
Previous by thread: [GNUnet-SVN] r8233 - libmicrohttpd/m4
Next by thread: [GNUnet-SVN] r8235 - GNUnet-docs/WWW
Index(es):
- Date
- Thread