41fc148ef9
New APIs: * New gnome_vfs_uri_resolve_relative call (Ian) * New module callback API (Mike, Maciej) * Authentication and proxy authentication callbacks (Mike) New features: * Start on an SSH module, disabled by default for now (Ian) * Handle the IceCast/ShoutCast non-standard variant of the HTTP protocol (Maciej) * SSL and https support (Ian, Seth, Maciej) * Extensive API docs (Seth, Sri, Ian, Jonathan, Maciej, Glynn) * New translation (Abel Cheung) Bug fixes: * Move headers for future parallel-install compatibility (Maciej) * FTP directory loading fixes (Jacob) * Fix detection of KOffice file mime types (Frederic) * Ensure all headers are standalone-includable (Darin) * Assorted code cleanup (Darin, Anders) * Split type declarations in gnome-vfs-types.h into individual headers; gnome-vfs-types.h is stull around for compat (Seth, Darin) * Header fixes (Darin) * Random crash and leak fixes (Havoc, Anders, Maciej) * Build fixes (Darin, Maciej, Ian, Robin, Carlos, Ramiro, Jonas) Portability fixes: * Fix module configuration files and parsing code to work on systems that don't use .so as the extension for shared libraries (Jacob) * Add recorsive mutex wrappers for use on systems that don't provide recursive mutexes natively (Dan) * Misc portability fixes (Laca, Frank Belew)
87 lines
4.8 KiB
Text
87 lines
4.8 KiB
Text
$NetBSD: patch-aa,v 1.4 2001/10/05 06:56:46 rh Exp $
|
|
|
|
--- aclocal.m4.orig Tue Sep 11 09:27:38 2001
|
|
+++ aclocal.m4
|
|
@@ -221,46 +221,37 @@
|
|
dnl AC_SUBST itself to avoid automake putting
|
|
dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
|
|
dnl in all the Makefile.in's, because that will blow up when substituted.
|
|
-XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
|
|
+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
|
|
HACK_SUBST(XML_I18N_MERGE_OAF_RULE)
|
|
|
|
-XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
|
|
+XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
|
|
HACK_SUBST(XML_I18N_MERGE_SERVER_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
|
|
+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
|
|
HACK_SUBST(XML_I18N_MERGE_KEYS_RULE)
|
|
dnl same deal
|
|
-XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
|
|
+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
|
|
HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
|
|
+XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
|
|
HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
|
|
+XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
|
|
HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
|
|
+XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
|
|
HACK_SUBST(XML_I18N_MERGE_PONG_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
|
|
+XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
|
|
HACK_SUBST(XML_I18N_MERGE_XML_RULE)
|
|
|
|
dnl same deal
|
|
-XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
|
|
- $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
|
|
+XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
|
|
HACK_SUBST(XML_I18N_MERGE_SHEET_RULE)
|
|
|
|
|
|
@@ -4556,17 +4547,6 @@
|
|
dnl From Jim Meyering. Use this if you use the GNU error.[ch].
|
|
dnl FIXME: Migrate into libit
|
|
|
|
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
|
|
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
|
|
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
|
|
- am_cv_lib_error_at_line=yes,
|
|
- am_cv_lib_error_at_line=no)])
|
|
- if test $am_cv_lib_error_at_line = no; then
|
|
- LIBOBJS="$LIBOBJS error.o"
|
|
- fi
|
|
- AC_SUBST(LIBOBJS)dnl
|
|
-])
|
|
-
|
|
dnl See whether we need a declaration for a function.
|
|
dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
|
|
AC_DEFUN([GCC_NEED_DECLARATION],
|
|
@@ -4706,7 +4686,7 @@
|
|
[CATOBJEXT=.gmo
|
|
DATADIRNAME=share],
|
|
[CATOBJEXT=.mo
|
|
- DATADIRNAME=lib])
|
|
+ DATADIRNAME=share])
|
|
INSTOBJEXT=.mo
|
|
fi
|
|
fi
|