gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r5930 - in GNUnet: . src/setup/qt
Date: Sun, 16 Dec 2007 05:18:29 -0700 (MST)

Author: durner
Date: 2007-12-16 05:18:28 -0700 (Sun, 16 Dec 2007)
New Revision: 5930

Modified:
   GNUnet/configure.ac
   GNUnet/src/setup/qt/Makefile.am
Log:
fix build system for gnunet-setup/Qt

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-12-16 10:57:23 UTC (rev 5929)
+++ GNUnet/configure.ac 2007-12-16 12:18:28 UTC (rev 5930)
@@ -471,9 +471,9 @@
               qt=1))
         ;;
       *)
-        QTLIBS="-L$with_qt/lib"
+        QTLIBS="$QTLIBS -L$with_qt/lib"
         LDFLAGS="$QTLIBS $LDFLAGS"
-        QTINC="-I$with_qt/include -I$with_qt/include/qt4"
+        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],
@@ -483,9 +483,9 @@
     esac
    ],
   [AC_MSG_RESULT([--with-qt not specified])
-    QTLIBS="-L/usr/lib"
+    QTLIBS="$QTLIBS -L/usr/lib"
     LDFLAGS="$QTLIBS $LDFLAGS"
-    QTINC="-I/usr/include -I/usr/include/qt4"
+    QTINC="$QTINC -I/usr/include -I/usr/include/qt4"
     CPPFLAGS="$QTINC $CPPFLAGS"
     AC_CHECK_HEADERS([Qt/qpixmap.h],
           AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],

Modified: GNUnet/src/setup/qt/Makefile.am
===================================================================
--- GNUnet/src/setup/qt/Makefile.am     2007-12-16 10:57:23 UTC (rev 5929)
+++ GNUnet/src/setup/qt/Makefile.am     2007-12-16 12:18:28 UTC (rev 5930)
@@ -8,6 +8,7 @@
 libgnunetsetup_qt_la_SOURCES = \
         qtconfig.cc \
         setupWizard.cc setupWizard.h \
+        moc_setupWizard.cpp \
         ui_enhanced.h ui_gnunet-setup.h
 
 libgnunetsetup_qt_la_LDFLAGS = \





reply via email to

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