[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8054 - in GNUnet: . contrib/macosx src src/applications/ad
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8054 - in GNUnet: . contrib/macosx src src/applications/advertising src/applications/bootstrap_http src/applications/chat/lib src/applications/chat/module src/applications/chat/tools src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/dstore_mysql src/applications/dstore_sqlite src/applications/dv/module src/applications/fragmentation src/applications/fs src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/namespace src/applications/fs/tools src/applications/fs/uritrack src/applications/getoption src/applications/hostlist src/applications/identity src/applications/kvstore_sqlite src/applications/pingpong src/applications/rpc src/applications/session src/applications/sqstore_mysql src/applications/sqstore_postgres src/applications/sqstore_sqlite src/applications/state src/applications/stats src/applications/tbench src/applications/template src/applications/testing src/applications/topology_default src/applications/tracekit src/applications/traffic src/applications/transport src/include src/intlemu src/libs/mysql src/server src/setup src/setup/cocoa src/setup/gtk src/setup/lib src/setup/ncurses src/setup/qt src/setup/text src/transports src/transports/upnp src/util |
|
Date: |
Tue, 30 Dec 2008 06:10:17 -0700 (MST) |
Author: holindho
Date: 2008-12-30 06:10:17 -0700 (Tue, 30 Dec 2008)
New Revision: 8054
Added:
GNUnet/src/intlemu/
GNUnet/src/intlemu/Makefile.am
GNUnet/src/intlemu/intlemu.c
GNUnet/src/intlemu/libintlemu.h
Removed:
GNUnet/contrib/macosx/English.lproj/
Modified:
GNUnet/configure.ac
GNUnet/contrib/macosx/build-osx-framework.sh
GNUnet/src/Makefile.am
GNUnet/src/applications/advertising/Makefile.am
GNUnet/src/applications/bootstrap_http/Makefile.am
GNUnet/src/applications/chat/lib/Makefile.am
GNUnet/src/applications/chat/module/Makefile.am
GNUnet/src/applications/chat/tools/Makefile.am
GNUnet/src/applications/datastore/Makefile.am
GNUnet/src/applications/dht/module/Makefile.am
GNUnet/src/applications/dht/tools/Makefile.am
GNUnet/src/applications/dstore_mysql/Makefile.am
GNUnet/src/applications/dstore_sqlite/Makefile.am
GNUnet/src/applications/dv/module/Makefile.am
GNUnet/src/applications/fragmentation/Makefile.am
GNUnet/src/applications/fs/Makefile.am
GNUnet/src/applications/fs/collection/Makefile.am
GNUnet/src/applications/fs/ecrs/Makefile.am
GNUnet/src/applications/fs/fsui/Makefile.am
GNUnet/src/applications/fs/gap/Makefile.am
GNUnet/src/applications/fs/lib/Makefile.am
GNUnet/src/applications/fs/namespace/Makefile.am
GNUnet/src/applications/fs/tools/Makefile.am
GNUnet/src/applications/fs/uritrack/Makefile.am
GNUnet/src/applications/getoption/Makefile.am
GNUnet/src/applications/hostlist/Makefile.am
GNUnet/src/applications/identity/Makefile.am
GNUnet/src/applications/kvstore_sqlite/Makefile.am
GNUnet/src/applications/pingpong/Makefile.am
GNUnet/src/applications/rpc/Makefile.am
GNUnet/src/applications/session/Makefile.am
GNUnet/src/applications/sqstore_mysql/Makefile.am
GNUnet/src/applications/sqstore_postgres/Makefile.am
GNUnet/src/applications/sqstore_sqlite/Makefile.am
GNUnet/src/applications/state/Makefile.am
GNUnet/src/applications/stats/Makefile.am
GNUnet/src/applications/tbench/Makefile.am
GNUnet/src/applications/template/Makefile.am
GNUnet/src/applications/testing/Makefile.am
GNUnet/src/applications/topology_default/Makefile.am
GNUnet/src/applications/tracekit/Makefile.am
GNUnet/src/applications/traffic/Makefile.am
GNUnet/src/applications/transport/Makefile.am
GNUnet/src/include/platform.h
GNUnet/src/libs/mysql/Makefile.am
GNUnet/src/server/Makefile.am
GNUnet/src/setup/Makefile.am
GNUnet/src/setup/cocoa/Makefile.am
GNUnet/src/setup/gtk/Makefile.am
GNUnet/src/setup/lib/Makefile.am
GNUnet/src/setup/ncurses/Makefile.am
GNUnet/src/setup/qt/Makefile.am
GNUnet/src/setup/text/Makefile.am
GNUnet/src/transports/Makefile.am
GNUnet/src/transports/upnp/Makefile.am
GNUnet/src/util/Makefile.am
Log:
intlemu
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/configure.ac 2008-12-30 13:10:17 UTC (rev 8054)
@@ -931,8 +931,17 @@
fi
AM_CONDITIONAL(HAVE_QT, test x$qt != x0)
+GN_INTLINCL=""
+GN_LIBINTL="$LTLIBINTL"
AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework
build helpers],enable_framework_build=$enableval)
AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes)
+if test x$enable_framework_build = xyes
+then
+ AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
+ GN_INTLINCL='-I$(top_srcdir)/src/intlemu'
+ GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework
CoreFoundation'
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL])
+fi
GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
@@ -952,6 +961,8 @@
fi
AC_SUBST(GN_LIB_LDFLAGS)
AC_SUBST(GN_PLUGIN_LDFLAGS)
+AC_SUBST(GN_INTLINCL)
+AC_SUBST(GN_LIBINTL)
AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS)
@@ -982,6 +993,7 @@
doc/man/Makefile
src/Makefile
src/include/Makefile
+src/intlemu/Makefile
src/applications/Makefile
src/applications/advertising/Makefile
src/applications/bootstrap_http/Makefile
Modified: GNUnet/contrib/macosx/build-osx-framework.sh
===================================================================
--- GNUnet/contrib/macosx/build-osx-framework.sh 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/contrib/macosx/build-osx-framework.sh 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -377,17 +377,17 @@
--disable-ares \
--with-random=/dev/urandom"
- prepare_package "${GETTEXT_NAME}"
- build_package "${GETTEXT_NAME}" \
- "${ARCH_HOSTSETTING} \
- --prefix="${FW_DIR}" \
- --with-pic \
- --disable-shared \
- --enable-static \
- --disable-java \
- --disable-native-java \
- --without-emacs \
- --with-libiconv-prefix=${SDK_PATH}/usr"
+# prepare_package "${GETTEXT_NAME}"
+# build_package "${GETTEXT_NAME}" \
+# "${ARCH_HOSTSETTING} \
+# --prefix="${FW_DIR}" \
+# --with-pic \
+# --disable-shared \
+# --enable-static \
+# --disable-java \
+# --disable-native-java \
+# --without-emacs \
+# --with-libiconv-prefix=${SDK_PATH}/usr"
prepare_package "${GMP_NAME}"
build_package "${GMP_NAME}" \
@@ -490,7 +490,6 @@
CXXFLAGS="${CXXFLAGS}" \
OBJCFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- gt_cv_func_gnugettext1_libintl=yes \
ac_cv_func_memcmp_working=yes \
ac_cv_func_stat_empty_string_bug=no \
ac_cv_func_chown_works=yes \
@@ -661,6 +660,52 @@
done
}
+install_message_catalog_to_framework()
+{
+ local src_file="$1"
+ local lang_name=$( basename -s .po $src_file )
+ local
dst_file="${FINAL_FW_DIR}/Resources/${lang_name}.lproj/Localizable.strings"
+ if [ ! -e "$dst_file" ]
+ then
+ echo "MSGCAT $src_file $dst_file"
+ create_directory_for "$dst_file"
+ if ! ( msgcat -t UTF-8 --stringtable-output -o "$dst_file"
"$src_file" )
+ then
+ echo "error creating message catalog: $lang"
+ exit 1
+ fi
+ if ! ( chmod 0755 "${dst_file}" )
+ then
+ echo "error setting permissions"
+ exit 1
+ fi
+ plutil -lint "$dst_file"
+ fi
+}
+
+install_en_message_catalog_to_framework()
+{
+ local src_file="$1"
+ local lang_name="en"
+ local
dst_file="${FINAL_FW_DIR}/Resources/${lang_name}.lproj/Localizable.strings"
+ if [ ! -e "$dst_file" ]
+ then
+ echo "MSGCAT $src_file $dst_file"
+ create_directory_for "$dst_file"
+ if ! ( msgcat -t UTF-8 "$src_file" | msgen --stringtable-output
-o "$dst_file" - )
+ then
+ echo "error creating English message catalog"
+ exit 1
+ fi
+ if ! ( chmod 0755 "${dst_file}" )
+ then
+ echo "error setting permissions"
+ exit 1
+ fi
+ plutil -lint "$dst_file"
+ fi
+}
+
copy_file_to_framework()
{
local src_file="$1"
@@ -824,7 +869,11 @@
cd "${ORIG_DIR}"
copy_file_to_framework "./contrib/macosx/Info.plist" "Resources/Info.plist"
fill_framework_revision "Resources/Info.plist"
-copy_file_to_framework "./contrib/macosx/English.lproj/InfoPlist.strings"
"Resources/English.lproj/InfoPlist.strings"
+for tfn in ./po/*.po
+do
+ install_message_catalog_to_framework "$tfn"
+done
+install_en_message_catalog_to_framework "./po/GNUnet.pot"
make_framework_link "lib/libgnunet.dylib" "GNUnet"
make_framework_link "lib" "Libraries"
make_framework_link "lib/GNUnet" "PlugIns"
Modified: GNUnet/src/Makefile.am
===================================================================
--- GNUnet/src/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -1,5 +1,9 @@
-SUBDIRS = include util libs setup server transports applications
+if WANT_FRAMEWORK
+ INTLEMU_SUBDIRS = intlemu
+endif
+SUBDIRS = include $(INTLEMU_SUBDIRS) util libs setup server transports
applications
+
if WANT_FRAMEWORK
lib_LTLIBRARIES = libgnunet.la
endif
Modified: GNUnet/src/applications/advertising/Makefile.am
===================================================================
--- GNUnet/src/applications/advertising/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/advertising/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -17,7 +17,7 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_advertising_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/bootstrap_http/Makefile.am
===================================================================
--- GNUnet/src/applications/bootstrap_http/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/bootstrap_http/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -13,7 +13,7 @@
http.c
libgnunetmodule_bootstrap_la_LIBADD = @LIBCURL@ \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_bootstrap_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_bootstrap_la_CPPFLAGS = \
Modified: GNUnet/src/applications/chat/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/lib/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/chat/lib/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -16,7 +16,7 @@
$(GN_LIB_LDFLAGS)
libgnunetchat_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
loopback_test
Modified: GNUnet/src/applications/chat/module/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/module/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/chat/module/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -18,4 +18,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_chat_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/chat/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/tools/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/chat/tools/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -12,4 +12,4 @@
gnunet_chat_LDADD = \
$(top_builddir)/src/applications/chat/lib/libgnunetchat_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/datastore/Makefile.am
===================================================================
--- GNUnet/src/applications/datastore/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/datastore/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -17,5 +17,5 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_datastore_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/dht/module/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/module/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/dht/module/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -19,4 +19,4 @@
libgnunetmodule_dht_la_LIBADD = -lm \
$(top_builddir)/src/applications/rpc/libgnunetrpc_util.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/dht/tools/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -16,14 +16,14 @@
$(GN_LIB_LDFLAGS)
libgnunetdht_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_dht_query_SOURCES = \
dht-query.c
gnunet_dht_query_LDADD = \
$(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/dstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_mysql/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/dstore_mysql/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -33,7 +33,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/libs/mysql/libgnunetmysql.la \
-lmysqlclient $(ZLIB_LNK) \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/dstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_sqlite/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/dstore_sqlite/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -28,7 +28,7 @@
libgnunetmodule_dstore_sqlite_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lsqlite3 \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/dv/module/Makefile.am
===================================================================
--- GNUnet/src/applications/dv/module/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/dv/module/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -18,4 +18,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_dv_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/fragmentation/Makefile.am
===================================================================
--- GNUnet/src/applications/fragmentation/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/fragmentation/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -13,7 +13,7 @@
fragmentation.c
libgnunetmodule_fragmentation_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_fragmentation_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
Modified: GNUnet/src/applications/fs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/fs/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -17,7 +17,7 @@
$(GN_LIB_LDFLAGS)
libgnunetecrs_core_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/collection/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/collection/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/fs/collection/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -16,7 +16,7 @@
$(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
collectiontest
Modified: GNUnet/src/applications/fs/ecrs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/ecrs/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/fs/ecrs/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -32,7 +32,7 @@
$(top_builddir)/src/applications/fs/lib/libgnunetfs.la \
$(top_builddir)/src/applications/getoption/libgnunetgetoption_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/fsui/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/fsui/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/fs/fsui/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -28,7 +28,7 @@
$(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = \
check.conf \
Modified: GNUnet/src/applications/fs/gap/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/gap/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/fs/gap/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -28,7 +28,7 @@
$(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
$(top_builddir)/src/util/libgnunetutil.la \
-lm \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/fs/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/lib/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/fs/lib/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -15,7 +15,7 @@
libgnunetfs_la_LIBADD = \
$(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/fs/namespace/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/namespace/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/fs/namespace/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -19,7 +19,7 @@
libgnunetnamespace_la_LIBADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
namespace_infotest \
Modified: GNUnet/src/applications/fs/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/tools/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/fs/tools/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -9,7 +9,7 @@
$(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
bin_PROGRAMS = \
gnunet-auto-share \
@@ -34,7 +34,7 @@
$(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_unindex_SOURCES = \
@@ -46,7 +46,7 @@
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_pseudonym_SOURCES = \
@@ -57,7 +57,7 @@
$(top_builddir)/src/applications/fs/collection/libgnunetcollection.la \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_search_SOURCES = \
gnunet-search.c
Modified: GNUnet/src/applications/fs/uritrack/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/uritrack/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/fs/uritrack/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -15,7 +15,7 @@
libgnuneturitrack_la_LIBADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/getoption/Makefile.am
===================================================================
--- GNUnet/src/applications/getoption/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/getoption/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -26,4 +26,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_getoption_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/hostlist/Makefile.am
===================================================================
--- GNUnet/src/applications/hostlist/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/hostlist/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -20,7 +20,7 @@
libgnunetmodule_hostlist_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lmicrohttpd \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/identity/Makefile.am
===================================================================
--- GNUnet/src/applications/identity/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/identity/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -22,7 +22,7 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_identity_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetidentity_api_la_SOURCES = \
@@ -31,7 +31,7 @@
$(GN_LIB_LDFLAGS)
libgnunetidentity_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
Modified: GNUnet/src/applications/kvstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/kvstore_sqlite/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -26,7 +26,7 @@
libgnunetmodule_kvstore_sqlite_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lsqlite3 \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/pingpong/Makefile.am
===================================================================
--- GNUnet/src/applications/pingpong/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/pingpong/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -14,4 +14,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_pingpong_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/rpc/Makefile.am
===================================================================
--- GNUnet/src/applications/rpc/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/rpc/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -18,7 +18,7 @@
libgnunetmodule_rpc_la_LIBADD = \
$(top_builddir)/src/applications/rpc/libgnunetrpc_util.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetrpc_util_la_SOURCES = \
parameters.c
Modified: GNUnet/src/applications/session/Makefile.am
===================================================================
--- GNUnet/src/applications/session/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/session/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -15,7 +15,7 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_session_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
if HAVE_MHD
httptest = sessiontest_http sessiontest_nat_http
Modified: GNUnet/src/applications/sqstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_mysql/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/sqstore_mysql/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -33,7 +33,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/libs/mysql/libgnunetmysql.la \
$(ZLIB_LNK) \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/sqstore_postgres/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_postgres/Makefile.am 2008-12-30
09:04:03 UTC (rev 8053)
+++ GNUnet/src/applications/sqstore_postgres/Makefile.am 2008-12-30
13:10:17 UTC (rev 8054)
@@ -28,7 +28,7 @@
libgnunetmodule_sqstore_postgres_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lpq \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/sqstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/sqstore_sqlite/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -28,7 +28,7 @@
libgnunetmodule_sqstore_sqlite_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lsqlite3 \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/state/Makefile.am
===================================================================
--- GNUnet/src/applications/state/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/state/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -14,4 +14,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_state_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/stats/Makefile.am
===================================================================
--- GNUnet/src/applications/stats/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/stats/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -23,7 +23,7 @@
gnunet_stats_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstats_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetstats_api_la_SOURCES = \
clientapi.c
@@ -31,7 +31,7 @@
$(GN_LIB_LDFLAGS)
libgnunetstats_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_stats_la_SOURCES = \
statistics.c \
@@ -40,5 +40,5 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_stats_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/tbench/Makefile.am
===================================================================
--- GNUnet/src/applications/tbench/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/tbench/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -17,7 +17,7 @@
tbench.h
gnunet_tbench_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_tbench_la_SOURCES = \
@@ -27,7 +27,7 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_tbench_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
if HAVE_MHD
Modified: GNUnet/src/applications/template/Makefile.am
===================================================================
--- GNUnet/src/applications/template/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/template/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -17,7 +17,7 @@
gnunet-template.c
gnunet_template_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_template_la_SOURCES = \
@@ -26,4 +26,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_template_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/testing/Makefile.am
===================================================================
--- GNUnet/src/applications/testing/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/testing/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -16,7 +16,7 @@
libgnunettesting_api_la_LIBADD = \
$(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetremote_api_la_SOURCES = \
remote.c remote.h
@@ -25,7 +25,7 @@
libgnunetremote_api_la_LIBADD = \
$(top_builddir)/src/applications/identity/libgnunetidentity_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
bin_PROGRAMS = \
remotetest
Modified: GNUnet/src/applications/topology_default/Makefile.am
===================================================================
--- GNUnet/src/applications/topology_default/Makefile.am 2008-12-30
09:04:03 UTC (rev 8053)
+++ GNUnet/src/applications/topology_default/Makefile.am 2008-12-30
13:10:17 UTC (rev 8054)
@@ -14,4 +14,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_topology_default_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/tracekit/Makefile.am
===================================================================
--- GNUnet/src/applications/tracekit/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/tracekit/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -20,7 +20,7 @@
gnunet_tracekit_LDADD = \
$(top_builddir)/src/applications/tracekit/libgnunettracekit_api.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_tracekit_la_SOURCES = \
@@ -30,7 +30,7 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_tracekit_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunettracekit_api_la_SOURCES = \
@@ -39,7 +39,7 @@
$(GN_LIB_LDFLAGS)
libgnunettracekit_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
EXTRA_DIST = check.conf
Modified: GNUnet/src/applications/traffic/Makefile.am
===================================================================
--- GNUnet/src/applications/traffic/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/applications/traffic/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -15,7 +15,7 @@
$(GN_LIB_LDFLAGS)
libgnunettraffic_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunetmodule_traffic_la_SOURCES = \
@@ -24,4 +24,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_traffic_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/applications/transport/Makefile.am
===================================================================
--- GNUnet/src/applications/transport/Makefile.am 2008-12-30 09:04:03 UTC
(rev 8053)
+++ GNUnet/src/applications/transport/Makefile.am 2008-12-30 13:10:17 UTC
(rev 8054)
@@ -15,4 +15,4 @@
$(GN_PLUGIN_LDFLAGS)
libgnunetmodule_transport_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/include/platform.h
===================================================================
--- GNUnet/src/include/platform.h 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/include/platform.h 2008-12-30 13:10:17 UTC (rev 8054)
@@ -165,12 +165,16 @@
#include <pthread.h>
#include <locale.h>
+#ifndef FRAMEWORK_BUILD
#include "gettext.h"
-
/**
* GNU gettext support macro.
*/
#define _(String) dgettext("GNUnet",String)
+#else
+#include "libintlemu.h"
+#define _(String) dgettext("org.gnunet.GNUnet",String)
+#endif
#ifdef CYGWIN
#define SIOCGIFCONF _IOW('s', 100, struct ifconf) /* get if list */
Added: GNUnet/src/intlemu/Makefile.am
===================================================================
--- GNUnet/src/intlemu/Makefile.am (rev 0)
+++ GNUnet/src/intlemu/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -0,0 +1,8 @@
+noinst_LTLIBRARIES = \
+ libintlemu.la
+
+libintlemu_la_SOURCES = \
+ libintlemu.h \
+ intlemu.c
+libintlemu_la_LDFLAGS = \
+ -framework CoreFoundation
Added: GNUnet/src/intlemu/intlemu.c
===================================================================
--- GNUnet/src/intlemu/intlemu.c (rev 0)
+++ GNUnet/src/intlemu/intlemu.c 2008-12-30 13:10:17 UTC (rev 8054)
@@ -0,0 +1,144 @@
+/*
+ * libintlemu - A Core Foundation libintl emulator
+ * Copyright (C) 2008 Heikki Lindholm <address@hidden>
+ *
+ * This program 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.
+ */
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+static pthread_mutex_t intlemu_lock;
+static CFMutableDictionaryRef intlemu_dict;
+
+static void intlemu_cstring_release(CFAllocatorRef allocator, const void
*value)
+{
+ free((void *)value);
+}
+
+void __attribute__ ((constructor)) intlemu_init_() {
+ CFDictionaryValueCallBacks cstring_value_callbacks =
+ {
+ 0, /* version */
+ NULL, /* retain callback */
+ &intlemu_cstring_release, /* release callback */
+ NULL, /* copy description */
+ NULL /* equal */
+ };
+ if (pthread_mutex_init(&intlemu_lock, NULL) != 0)
+ abort();
+
+ intlemu_dict = CFDictionaryCreateMutable(
+ kCFAllocatorDefault,
+ 0,
+ &kCFCopyStringDictionaryKeyCallBacks,
+ &cstring_value_callbacks);
+ if (intlemu_dict == NULL)
+ abort();
+}
+
+void __attribute__ ((destructor)) intlemu_fini_() {
+ if (intlemu_dict)
+ CFRelease(intlemu_dict);
+
+ pthread_mutex_destroy(&intlemu_lock);
+}
+
+char * intlemu_bgettext (CFBundleRef bundle, const char *msgid)
+{
+ CFStringRef key;
+ const char *value;
+ CFStringRef s;
+ CFRange r;
+ CFIndex len;
+ CFIndex clen;
+ char *buf;
+
+ if (msgid == NULL)
+ return NULL;
+
+ key = CFStringCreateWithBytes(
+ kCFAllocatorDefault,
+ (const UInt8 *)msgid,
+ (CFIndex)strlen(msgid),
+ kCFStringEncodingUTF8,
+ false);
+
+ if (pthread_mutex_lock(&intlemu_lock) != 0)
+ abort();
+ value = (char *)CFDictionaryGetValue(intlemu_dict, key);
+ if (pthread_mutex_unlock(&intlemu_lock) != 0)
+ abort();
+ if (value != NULL) {
+ CFRelease(key);
+ return (char *)value;
+ }
+
+ /* no cached translaation, so, find one from the bundle */
+ s = CFBundleCopyLocalizedString(
+ bundle,
+ key,
+ NULL,
+ NULL);
+ if (s == key) {
+ CFRelease(key);
+ return (char *)msgid;
+ }
+ /* get the length in bytes */
+ r.location = 0;
+ r.length = CFStringGetLength(s);
+ len = 0;
+ clen = CFStringGetBytes(
+ s,
+ r,
+ kCFStringEncodingUTF8,
+ 0,
+ false,
+ NULL,
+ 0,
+ &len);
+ buf = NULL;
+ if (clen == r.length) {
+ buf = malloc(len + 1);
+ }
+
+ if (buf == NULL) {
+ CFRelease(s);
+ CFRelease(key);
+ return (char *)msgid;
+ }
+
+ clen = CFStringGetBytes(
+ s,
+ r,
+ kCFStringEncodingUTF8,
+ 0,
+ false,
+ (UInt8 *)buf,
+ len,
+ &len);
+ buf[len] = '\0';
+ if (clen == r.length) {
+ if (pthread_mutex_lock(&intlemu_lock) != 0)
+ abort();
+ CFDictionaryAddValue(intlemu_dict, key, buf);
+ if (pthread_mutex_unlock(&intlemu_lock) != 0)
+ abort();
+ value = buf;
+ }
+ else {
+ free(buf);
+ value = msgid;
+ }
+
+ CFRelease(s);
+
+ CFRelease(key);
+
+ return (char *)value;
+}
+
Added: GNUnet/src/intlemu/libintlemu.h
===================================================================
--- GNUnet/src/intlemu/libintlemu.h (rev 0)
+++ GNUnet/src/intlemu/libintlemu.h 2008-12-30 13:10:17 UTC (rev 8054)
@@ -0,0 +1,26 @@
+/*
+ * libintlemu - A Core Foundation libintl emulator
+ * Copyright (C) 2008 Heikki Lindholm <address@hidden>
+ *
+ * This program 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.
+ */
+
+#ifndef LIBINTLEMU_H
+#define LIBINTLEMU_H
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#define gettext(msgid) \
+ intlemu_bgettext(CFBundleGetMainBundle(), msgid)
+
+#define dgettext(domainname, msgid) \
+ intlemu_bgettext(CFBundleGetBundleWithIdentifier(CFSTR(domainname)),
msgid)
+
+#define gettext_noop(s) s
+
+extern char * intlemu_bgettext (CFBundleRef bundle, const char *msgid);
+
+#endif
Modified: GNUnet/src/libs/mysql/Makefile.am
===================================================================
--- GNUnet/src/libs/mysql/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/libs/mysql/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -21,5 +21,5 @@
libgnunetmysql_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lmysqlclient $(ZLIB_LNK) \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/server/Makefile.am
===================================================================
--- GNUnet/src/server/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/server/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -25,31 +25,31 @@
$(GN_LIB_LDFLAGS)
libgnunetcore_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunetd_SOURCES = \
gnunetd.c
gnunetd_LDADD = \
$(top_builddir)/src/server/libgnunetcore.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_update_SOURCES = \
gnunet-update.c
gnunet_update_LDADD = \
$(top_builddir)/src/server/libgnunetcore.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_peer_info_SOURCES = \
gnunet-peer-info.c
gnunet_peer_info_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/server/libgnunetcore.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_transport_check_SOURCES = \
gnunet-transport-check.c
gnunet_transport_check_LDADD = \
$(top_builddir)/src/server/libgnunetcore.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/setup/Makefile.am
===================================================================
--- GNUnet/src/setup/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -41,7 +41,7 @@
gnunet_setup_LDADD = \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
gnunet_win_tool_SOURCE = \
gnunet-win-tool.c
Modified: GNUnet/src/setup/cocoa/Makefile.am
===================================================================
--- GNUnet/src/setup/cocoa/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/cocoa/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -24,5 +24,5 @@
libgnunetsetup_cocoa_la_LIBADD = \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/gtk/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -37,5 +37,5 @@
-lgthread-2.0 \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/setup/lib/Makefile.am
===================================================================
--- GNUnet/src/setup/lib/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/lib/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -21,7 +21,7 @@
libgnunetsetup_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GUILE_LIB) \
- $(LTLIBINTL) \
+ $(GN_LIBINTL) \
$(LIBLTDL) \
$(LIBADD_DL)
Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/setup/ncurses/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -30,5 +30,5 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
-lncursesw $(DIALOG_LIBS) -lm \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/setup/qt/Makefile.am
===================================================================
--- GNUnet/src/setup/qt/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/qt/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -28,7 +28,7 @@
@QTLIBS@ @EXT_LIB_PATH@ @EXT_LIBS@ \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/setup/text/Makefile.am
===================================================================
--- GNUnet/src/setup/text/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/setup/text/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -12,4 +12,4 @@
libgnunetsetup_text_la_LIBADD = \
$(top_builddir)/src/setup/lib/libgnunetsetup.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
Modified: GNUnet/src/transports/Makefile.am
===================================================================
--- GNUnet/src/transports/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/transports/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -42,7 +42,7 @@
$(GN_LIB_LDFLAGS)
libgnunetip_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
plugin_LTLIBRARIES = \
libgnunettransport_tcp.la \
@@ -54,7 +54,7 @@
libgnunettransport_smtp_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lesmtp \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunettransport_smtp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -63,7 +63,7 @@
-lmicrohttpd @LIBCURL@ \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetip.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunettransport_http_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunettransport_http_la_CPPFLAGS = \
@@ -73,7 +73,7 @@
libgnunettransport_tcp_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetip.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunettransport_tcp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -88,7 +88,7 @@
libgnunettransport_udp_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetip.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
libgnunettransport_udp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
Modified: GNUnet/src/transports/upnp/Makefile.am
===================================================================
--- GNUnet/src/transports/upnp/Makefile.am 2008-12-30 09:04:03 UTC (rev
8053)
+++ GNUnet/src/transports/upnp/Makefile.am 2008-12-30 13:10:17 UTC (rev
8054)
@@ -28,7 +28,7 @@
libgnunetmodule_upnp_la_LIBADD = \
@EXT_LIB_PATH@ @EXT_LIBS@ @XML_LIBS@ @LIBCURL@ \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
+ $(GN_LIBINTL)
check_PROGRAMS = \
upnptest
Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2008-12-30 09:04:03 UTC (rev 8053)
+++ GNUnet/src/util/Makefile.am 2008-12-30 13:10:17 UTC (rev 8054)
@@ -64,7 +64,7 @@
$(GCLIBADD) $(CYGLIBADD) $(WINLIBADD) \
$(LIBGCRYPT_LIBS) \
-lgmp \
- $(LTLIBINTL) \
+ $(GN_LIBINTL) \
$(LTLIBICONV) \
$(LIBLTDL) \
$(LIBADD_DL) \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8054 - in GNUnet: . contrib/macosx src src/applications/advertising src/applications/bootstrap_http src/applications/chat/lib src/applications/chat/module src/applications/chat/tools src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/dstore_mysql src/applications/dstore_sqlite src/applications/dv/module src/applications/fragmentation src/applications/fs src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/namespace src/applications/fs/tools src/applications/fs/uritrack src/applications/getoption src/applications/hostlist src/applications/identity src/applications/kvstore_sqlite src/applications/pingpong src/applications/rpc src/applications/session src/applications/sqstore_mysql src/applications/sqstore_postgres src/applications/sqstore_sqlite src/applications/state src/applications/stats src/applications/tbench src/applications/template src/applications/testing src/applications/topology_default src/applications/tracekit src/applications/traffic src/applications/transport src/include src/intlemu src/libs/mysql src/server src/setup src/setup/cocoa src/setup/gtk src/setup/lib src/setup/ncurses src/setup/qt src/setup/text src/transports src/transports/upnp src/util,
gnunet <=