[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r240 - in GNUnet/src/applications: . fs/fsui fs/tools gap t
From: |
durner |
Subject: |
[GNUnet-SVN] r240 - in GNUnet/src/applications: . fs/fsui fs/tools gap template |
Date: |
Fri, 11 Feb 2005 09:04:43 -0800 (PST) |
Author: durner
Date: 2005-02-11 09:04:42 -0800 (Fri, 11 Feb 2005)
New Revision: 240
Modified:
GNUnet/src/applications/Makefile.am
GNUnet/src/applications/fs/fsui/Makefile.am
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/gap/Makefile.am
GNUnet/src/applications/template/Makefile.am
Log:
Fix MinGW
Modified: GNUnet/src/applications/Makefile.am
===================================================================
--- GNUnet/src/applications/Makefile.am 2005-02-11 16:38:27 UTC (rev 239)
+++ GNUnet/src/applications/Makefile.am 2005-02-11 17:04:42 UTC (rev 240)
@@ -1,3 +1,11 @@
+if HAVE_MYSQL
+ MYSQL_DIR = sqstore_mysql
+endif
+
+if !MINGW
+ TESTBED_DIR = testbed
+endif
+
SUBDIRS = \
advertising \
bootstrap_http \
@@ -12,11 +20,11 @@
identity \
pingpong \
session \
- sqstore_mysql \
+ $(MYSQL_DIR) \
stats \
tbench \
template \
- testbed \
+ $(TESTED_DIR) \
topology_default \
traffic \
transport
Modified: GNUnet/src/applications/fs/fsui/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/fsui/Makefile.am 2005-02-11 16:38:27 UTC (rev
239)
+++ GNUnet/src/applications/fs/fsui/Makefile.am 2005-02-11 17:04:42 UTC (rev
240)
@@ -14,6 +14,7 @@
search.c \
upload.c
libgnunetfsui_la_LIBADD = \
+ -lextractor \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-02-11 16:38:27 UTC
(rev 239)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-02-11 17:04:42 UTC
(rev 240)
@@ -30,7 +30,9 @@
#include "platform.h"
#include "gnunet_fsui_lib.h"
+#ifndef MINGW
#include <langinfo.h>
+#endif
/* hmm. Man says time.h, but that doesn't yield the
prototype. Strange... */
@@ -315,7 +317,12 @@
topKeywords[topKeywordCnt-1]
= convertToUtf8(GNoptarg,
strlen(GNoptarg),
- nl_langinfo(CODESET));
+#ifndef MINGW
+ nl_langinfo(CODESET)
+#else
+ ""
+#endif
+ );
break;
case 'K':
GROW(gloKeywords,
@@ -324,7 +331,12 @@
gloKeywords[gloKeywordCnt-1]
= convertToUtf8(GNoptarg,
strlen(GNoptarg),
- nl_langinfo(CODESET));
+#ifndef MINGW
+ nl_langinfo(CODESET)
+#else
+ ""
+#endif
+ );
break;
case 'm': {
EXTRACTOR_KeywordType type;
@@ -332,7 +344,12 @@
tmp = convertToUtf8(GNoptarg,
strlen(GNoptarg),
- nl_langinfo(CODESET));
+#ifndef MINGW
+ nl_langinfo(CODESET)
+#else
+ ""
+#endif
+ );
type = EXTRACTOR_getHighestKeywordTypeNumber();
while (type > 0) {
type--;
@@ -552,11 +569,20 @@
if (timestr != NULL) {
struct tm t;
if ((NULL == strptime(timestr,
+#ifndef MINGW
nl_langinfo(D_T_FMT),
+#else
+ "%Y%m%d",
+#endif
&t))) {
LOG_STRERROR(LOG_FATAL, "strptime");
errexit(_("Parsing time failed. Use '%s' format.\n"),
- nl_langinfo(D_T_FMT));
+#ifndef MINGW
+ nl_langinfo(D_T_FMT)
+#else
+ "%Y%m%d"
+#endif
+ );
}
FREE(timestr);
}
Modified: GNUnet/src/applications/gap/Makefile.am
===================================================================
--- GNUnet/src/applications/gap/Makefile.am 2005-02-11 16:38:27 UTC (rev
239)
+++ GNUnet/src/applications/gap/Makefile.am 2005-02-11 17:04:42 UTC (rev
240)
@@ -12,5 +12,6 @@
libgnunetmodule_gap_la_SOURCES = \
gap.c
libgnunetmodule_gap_la_LDFLAGS = \
- -export-dynamic -avoid-version -module
+ -export-dynamic -avoid-version -module \
+ $(LDADD)
Modified: GNUnet/src/applications/template/Makefile.am
===================================================================
--- GNUnet/src/applications/template/Makefile.am 2005-02-11 16:38:27 UTC
(rev 239)
+++ GNUnet/src/applications/template/Makefile.am 2005-02-11 17:04:42 UTC
(rev 240)
@@ -18,5 +18,6 @@
libgnunetmodule_template_la_SOURCES = \
template.c
libgnunetmodule_template_la_LDFLAGS = \
- -export-dynamic -avoid-version -module
+ -export-dynamic -avoid-version -module \
+ $(LDADD)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r240 - in GNUnet/src/applications: . fs/fsui fs/tools gap template,
durner <=