gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r7153 - in gnunet-qt: . src/common src/plugins/general src/


From: gnunet
Subject: [GNUnet-SVN] r7153 - in gnunet-qt: . src/common src/plugins/general src/plugins/stats
Date: Thu, 12 Jun 2008 01:06:11 -0600 (MDT)

Author: grothoff
Date: 2008-06-12 01:06:11 -0600 (Thu, 12 Jun 2008)
New Revision: 7153

Modified:
   gnunet-qt/README
   gnunet-qt/configure.ac
   gnunet-qt/src/common/Makefile.am
   gnunet-qt/src/plugins/general/Makefile.am
   gnunet-qt/src/plugins/stats/Makefile.am
   gnunet-qt/src/plugins/stats/statsThread.cc
Log:
Fixing various build system issues:

* includes were not set ok for linux; as a result headers were not found
* the common library must not be a plugin but a normal shared library (could 
cause serious problems otherwise)
* since everything else will require 0.8.0-support, I removed support for the 
ancient stats lib
* failure to detect/link qt did not result in any errors at configure time
* if QTDIR was not exported before running configure, the various pre-defined 
(ugly) includes
  in the os-check were all totally wrong (no prefix)

The "test" for qt is still quite ugly, but it at least works for me now
and I'm pretty sure I did not break W32.



Modified: gnunet-qt/README
===================================================================
--- gnunet-qt/README    2008-06-12 06:14:19 UTC (rev 7152)
+++ gnunet-qt/README    2008-06-12 07:06:11 UTC (rev 7153)
@@ -2,9 +2,9 @@
 
 
 
-  Copyright (C) 2006, 2007 Nils Durner (and other contributing authors)
+  Copyright (C) 2006, 2007, 2008 Nils Durner (and other contributing authors)
 
-  gnunet_qt is free software; you can redistribute it and/or modify
+  gnunet-qt is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac      2008-06-12 06:14:19 UTC (rev 7152)
+++ gnunet-qt/configure.ac      2008-06-12 07:06:11 UTC (rev 7153)
@@ -1,10 +1,10 @@
-dnl Process this file with autoconf to produce a configure script.
+# Process this file with autoconf to produce a configure script.
 
 AC_INIT([gnunet-qt],[0.8.0pre1],address@hidden)
-dnl Every other copy of the package version number gets its value from here
+# Every other copy of the package version number gets its value from here
 AM_INIT_AUTOMAKE([gnunet-qt], 0.8.0pre1)
 
-dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
+# create a config.h file (Automake will add -DHAVE_CONFIG_H)
 AM_CONFIG_HEADER(config.h)
 
 AC_SUBST(VERSION)
@@ -26,6 +26,16 @@
 ;;
 esac
 
+# FIXME: should support --with-qt, but
+# this would have to be done before the
+# "case $host_os" which depends on QTDIR;
+# However, the check itself may depend
+# on the case-host_os defines, so yuck...
+if test -z $QTDIR
+then
+# best guess
+  QTDIR=/usr
+fi
 
 AC_PATH_XTRA
 
@@ -35,13 +45,13 @@
      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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
       ;;
 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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 freebsd*)
@@ -49,7 +59,7 @@
      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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 openbsd*)
@@ -57,7 +67,7 @@
      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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 netbsd*)
@@ -66,21 +76,21 @@
      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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 *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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 *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 -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     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"
      ;;
 *cygwin*)
@@ -110,7 +120,7 @@
      ;;
 esac
 
-dnl Checks for programs.
+# Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
@@ -131,14 +141,14 @@
 AC_SUBST(MKDIR_P)
 
 
-dnl Checks for libraries.
-
+# Checks for libraries.
 AC_HEADER_MAJOR
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics.
 
-dnl Checks for library functions.
+# Checks for library functions.
 
+# Check for C compiler support for -fno-strict-aliasing
 CFLAGS="-Wall $CFLAGS"
 # use '-fno-strict-aliasing', but only if the compiler can take it
 if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
@@ -146,7 +156,7 @@
        QT_CFLAGS="-fno-strict-aliasing"
 fi
 
-# test for qmake
+# test for qmake (FIXME: do we still need qmake!?? -- how about checking for 
moc?
 AC_CHECK_PROG([QMAKE], [qmake-qt4], [qmake-qt4], [qmake])
 
 # test for GNUnet core
@@ -188,19 +198,15 @@
 
 SAVELIBS=$LIBS
 AC_CHECK_LIB(gnunetutil,GNUNET_GE_LOG,,
-             AC_MSG_ERROR([gnunet-qt requires GNUnet-Util]))
+             AC_MSG_ERROR([gnunet-qt requires libgnunetutil]))
 AC_CHECK_LIB(gnunetecrs,GNUNET_ECRS_uri_to_string,,
-             AC_MSG_ERROR([gnunet-qt requires ECRS]))
+             AC_MSG_ERROR([gnunet-qt requires libgnunetecrs]))
 AC_CHECK_LIB(gnunetfsui,GNUNET_FSUI_start,,
-             AC_MSG_ERROR([gnunet-qt requires FSUI]))
-LIBS="-lgnunetstats_api $LIBS"
+             AC_MSG_ERROR([gnunet-qt requires libgnunetfsui]))
+AC_CHECK_LIB(gnunetstats_api,GNUNET_STATS_get_statistics,,
+             AC_MSG_ERROR([gnunet-qt requires libgnunetstats_api]))
+$LIBS=$SAVELIBS
 
-# check for newer STATS functions
-AC_CHECK_FUNC(GNUNET_STATS_get_statistics, HAVE_STATS=1, HAVE_STATS=0)
-LIBS=$SAVELIBS
-AC_DEFINE_UNQUOTED([HAVE_STATS], $HAVE_STATS, [We have the new stats library])
-
-
 # test for libextractor
 extractor=0
 AC_MSG_CHECKING(for libextractor)
@@ -229,56 +235,18 @@
  AC_MSG_ERROR([gnunet-qt requires libextractor headers])
 fi
 
-# check for Qt 4
+# check for Qt 4 (yucky)
 AC_LANG_PUSH([C++])
-qt=0
 AC_MSG_CHECKING(for Qt)
-AC_ARG_WITH(qt,
-   [  --with-qt=PFX    Base of Qt installation],
-   [AC_MSG_RESULT([$with_qt])
-    case $with_qt in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS([Qt/qpixmap.h],
-           AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
-              qt=1))
-        ;;
-      *)
-        QTLIBS="$QTLIBS -L$with_qt/lib"
-        LDFLAGS="$QTLIBS $LDFLAGS"
-        QTINC="$QTINC -I$with_qt/include -I$with_qt/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"
-           qt=1))
-        ;;
-    esac
-   ],
-  [AC_MSG_RESULT([--with-qt not specified])
-    QTLIBS="$QTLIBS -L/usr/lib"
-    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"
-              qt=1))])
-
-LIBS="$LIBS $QTLIBS"
+LDFLAGS="$QTLIBS $LDFLAGS"
 INCLUDES="$INCLUDES $QTINC"
-PATH="$PATH:$QTBIN"
+CPPFLAGS="$QTINC $CPPFLAGS"
 CXXFLAGS="$CXXFLAGS $QTINC"
-AC_SUBST(QTINC)
-AC_SUBST(QTLIBS)
-
+LIBS="$LIBS $QTLIBS"
+PATH="$PATH:$QTBIN"
+AC_CHECK_HEADERS([Qt/qpixmap.h],,AC_MSG_ERROR([gnunet-qt requires qpixmap.h]))
+AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui 
QtGui4],,AC_MSG_ERROR([Error linking test qt4 program]))
 AC_LANG_POP([C++])
-if test $qt == 0
-then
-  AC_MSG_ERROR([gnunet-qt requires Qt4])
-fi
-
 AC_SUBST(INCLUDEPATH)
 AC_SUBST(LIBPATH)
 

Modified: gnunet-qt/src/common/Makefile.am
===================================================================
--- gnunet-qt/src/common/Makefile.am    2008-06-12 06:14:19 UTC (rev 7152)
+++ gnunet-qt/src/common/Makefile.am    2008-06-12 07:06:11 UTC (rev 7153)
@@ -1,8 +1,6 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
-plugindir = $(libdir)/GNUnet
-
-plugin_LTLIBRARIES = \
+lib_LTLIBRARIES = \
   libgnunetqt_common.la
 
 libgnunetqt_common_la_SOURCES = \
@@ -21,7 +19,7 @@
 gstring.cc: ui_textEditor.h
 
 libgnunetqt_common_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module -lgnunetutil @LIBS@
+  -lgnunetutil @LIBS@
 
 nodist_libgnunetqt_common_la_SOURCES = \
   ui_textEditor.h \

Modified: gnunet-qt/src/plugins/general/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/general/Makefile.am   2008-06-12 06:14:19 UTC (rev 
7152)
+++ gnunet-qt/src/plugins/general/Makefile.am   2008-06-12 07:06:11 UTC (rev 
7153)
@@ -25,7 +25,7 @@
   $(top_builddir)/src/common/libgnunetqt_common.la
 
 libgnunetqtmodule_general_la_LDFLAGS = \
-  -lgnunetutil -lgnunetgetoption_api -lgnunetutil_network_client @LIBS@ 
-export-dynamic -avoid-version -module
+  -lgnunetutil -lgnunetgetoption_api @LIBS@ -export-dynamic -avoid-version 
-module
 
 EXTRA_DIST = \
   general.ui

Modified: gnunet-qt/src/plugins/stats/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/stats/Makefile.am     2008-06-12 06:14:19 UTC (rev 
7152)
+++ gnunet-qt/src/plugins/stats/Makefile.am     2008-06-12 07:06:11 UTC (rev 
7153)
@@ -17,7 +17,7 @@
   ui_stats.h
 
 statsPlugin.cc: ui_stats.h
-  
+
 libgnunetqtmodule_stats_la_LIBADD = \
   $(top_builddir)/src/common/libgnunetqt_common.la
 

Modified: gnunet-qt/src/plugins/stats/statsThread.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.cc  2008-06-12 06:14:19 UTC (rev 
7152)
+++ gnunet-qt/src/plugins/stats/statsThread.cc  2008-06-12 07:06:11 UTC (rev 
7153)
@@ -68,16 +68,10 @@
   while (! stopSignalled)
   {
     timer.start();
-#if HAVE_STATS
     res = GNUNET_STATS_get_statistics(errorContext,
             sock,
             &acquireStatistics, 
             this);
-#else
-    res = requestStatistics(errorContext, sock,
-      (StatisticsProcessor) &acquireStatistics, this);
-#endif
-
     if (res != GNUNET_OK)
       GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR | 
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
         qPrintable(tr("Error reading information from background process 
gnunetd.")));





reply via email to

[Prev in Thread] Current Thread [Next in Thread]