[GNUnet-SVN] r8212 - in GNUnet: . src/setup/qt

[gnunet]

Author: holindho
Date: 2009-02-09 09:37:09 -0700 (Mon, 09 Feb 2009)
New Revision: 8212

Modified:
   GNUnet/configure.ac
   GNUnet/src/setup/qt/gstring.cc
Log:
fix Qt4 build on OS X (native Qt, not X11)


Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-02-09 05:23:25 UTC (rev 8211)
+++ GNUnet/configure.ac 2009-02-09 16:37:09 UTC (rev 8212)
@@ -574,10 +574,16 @@
     esac
    ],
   [AC_MSG_RESULT([--with-qt not specified])
+    QTINC="$QTINC -I/usr/include -I/usr/include/qt4"
     QTLIBS="$QTLIBS -L/usr/lib"
+    if ( pkg-config --help > /dev/null 2> /dev/null ) ; then
+      if ( pkg-config --cflags QtGui && pkg-config --libs QtGui ) ; then
+        QTINC=`pkg-config --cflags QtGui`
+        QTLIBS=`pkg-config --libs QtGui`
+      fi
+    fi
+    CPPFLAGS="$QTINC $CPPFLAGS"
     LDFLAGS="$QTLIBS $LDFLAGS"
-    QTINC="$QTINC -I/usr/include -I/usr/include/qt4"
-    CPPFLAGS="$QTINC $CPPFLAGS"
     AC_CHECK_HEADERS([Qt/qpixmap.h],
                  AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
            EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"

Modified: GNUnet/src/setup/qt/gstring.cc
===================================================================
--- GNUnet/src/setup/qt/gstring.cc      2009-02-09 05:23:25 UTC (rev 8211)
+++ GNUnet/src/setup/qt/gstring.cc      2009-02-09 16:37:09 UTC (rev 8212)
@@ -24,7 +24,9 @@
  */
 
 #include <QtCore/QByteArray>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include "gstring.h"
 
 GString::GString(const char *str) : QString(str)