[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5954 - in GNUnet: . src/setup/lib src/setup/qt
From: |
gnunet |
Subject: |
[GNUnet-SVN] r5954 - in GNUnet: . src/setup/lib src/setup/qt |
Date: |
Mon, 17 Dec 2007 18:29:00 -0700 (MST) |
Author: grothoff
Date: 2007-12-17 18:28:59 -0700 (Mon, 17 Dec 2007)
New Revision: 5954
Modified:
GNUnet/configure.ac
GNUnet/src/setup/lib/Makefile.am
GNUnet/src/setup/qt/ui_gnunet-setup.h
Log:
make guile lib optional as well -- missing earlier commit for configure.ac
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-12-17 22:59:55 UTC (rev 5953)
+++ GNUnet/configure.ac 2007-12-18 01:28:59 UTC (rev 5954)
@@ -223,10 +223,14 @@
# libcurl
LIBCURL_CHECK_CONFIG(,7.15.4,,AC_MSG_ERROR([GNUnet requires libcurl >=
7.15.4]))
+# restore LIBS
+LIBS=$SAVE_LIBS
# libxml2
AM_PATH_XML2(,xml=1,xml=0)
AM_CONDITIONAL(HAVE_XML2, test x$xml = x1)
+# restore LIBS
+LIBS=$SAVE_LIBS
# test for kvm and kstat (for CPU stats under BSD/Solaris)
AC_CHECK_LIB([kvm],[kvm_open])
@@ -264,6 +268,8 @@
then
AC_MSG_ERROR([GNUnet requires libextractor])
fi
+# restore LIBS
+LIBS=$SAVE_LIBS
# test for libgmp
gmp=0
@@ -412,7 +418,8 @@
fi
AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
AM_CONDITIONAL(HAVE_MYSQLE, test "0" = "1")
-
+# restore LIBS
+LIBS=$SAVE_LIBS
LDFLAGS=$SAVE_LDFLAGS
CPPFLAGS=$SAVE_CPPFLAGS
@@ -454,6 +461,8 @@
AM_CONDITIONAL(HAVE_DIALOG, test x$dialog = x1)
AC_DEFINE_UNQUOTED([HAVE_DIALOG], $dialog, [We have dialog])
+# restore LIBS
+LIBS=$SAVE_LIBS
# check for Qt 4
AC_LANG_PUSH([C++])
@@ -576,8 +585,9 @@
rm -f moc_myqt.cpp myqt.h myqt.cpp myqt.o myqt moc_myqt.o
AC_LANG_POP([C++])
+# restore LIBS
+LIBS=$SAVE_LIBS
-
# libmicrohttpd
lmhd=0
AC_MSG_CHECKING([for libmicrohttpd])
@@ -608,8 +618,9 @@
lmhd=1))])
AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
+# restore LIBS
+LIBS=$SAVE_LIBS
-
# libesmtp
esmtp=0
AC_MSG_CHECKING([for libesmtp])
@@ -640,9 +651,10 @@
esmtp=1))])
AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1)
AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
+# restore LIBS
+LIBS=$SAVE_LIBS
-
# GNU adns
adns=0
AC_CHECK_LIB([adns],[adns_init])
@@ -675,7 +687,10 @@
AM_CONDITIONAL(HAVE_ADNS, test x$adns = x1)
AC_DEFINE_UNQUOTED([HAVE_ADNS], $adns, [We have GNU adns])
+# restore LIBS
+LIBS=$SAVE_LIBS
+
# check for gtk >= 2.6.0
AC_MSG_CHECKING(for gtk)
AM_PATH_GTK_2_0(2.6.0,without_gtk=false,without_gtk=true)
Modified: GNUnet/src/setup/lib/Makefile.am
===================================================================
--- GNUnet/src/setup/lib/Makefile.am 2007-12-17 22:59:55 UTC (rev 5953)
+++ GNUnet/src/setup/lib/Makefile.am 2007-12-18 01:28:59 UTC (rev 5954)
@@ -10,9 +10,10 @@
lib_LTLIBRARIES = libgnunetsetup.la
if HAVE_GUILE
- GUILE_SRC = \
- gns.c \
- tree.c tree.h
+ GUILE_SRC = \
+ gns.c \
+ tree.c tree.h
+ GUILE_LIB = -lguile
endif
libgnunetsetup_la_SOURCES = \
@@ -23,7 +24,7 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunetsetup_la_LDFLAGS = \
- -export-dynamic -lguile
+ -export-dynamic $(GUILE_LIB)
libgnunetsetup_la_CFLAGS = -I$(top_scrdir)/include
Modified: GNUnet/src/setup/qt/ui_gnunet-setup.h
===================================================================
--- GNUnet/src/setup/qt/ui_gnunet-setup.h 2007-12-17 22:59:55 UTC (rev
5953)
+++ GNUnet/src/setup/qt/ui_gnunet-setup.h 2007-12-18 01:28:59 UTC (rev
5954)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'gnunet-setup.ui'
**
-** Created: Sun Dec 16 19:36:44 2007
+** Created: Mon Dec 17 18:28:24 2007
** by: Qt User Interface Compiler version 4.3.2
**
** WARNING! All changes made in this file will be lost when recompiling ui
file!
@@ -504,6 +504,7 @@
spinQuota = new QSpinBox(groupBox_4);
spinQuota->setObjectName(QString::fromUtf8("spinQuota"));
spinQuota->setMinimumSize(QSize(370, 0));
+ spinQuota->setMaximum(1000000);
hboxLayout8->addWidget(spinQuota);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5954 - in GNUnet: . src/setup/lib src/setup/qt,
gnunet <=