diff options
1753 files changed, 908958 insertions, 63 deletions
diff --git a/COPYING.MIT b/COPYING.MIT index e69de29bb2..fb950dc69f 100644 --- a/COPYING.MIT +++ b/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/acpid/acpid-1.0.2/init b/acpid/acpid-1.0.2/init index e69de29bb2..4937e71e9f 100644 --- a/acpid/acpid-1.0.2/init +++ b/acpid/acpid-1.0.2/init @@ -0,0 +1,26 @@ +#! /bin/sh -e + +test -x /usr/sbin/acpid || exit 0 +test -d /proc/acpi || exit 0 + +case "$1" in + start) + echo -n "Starting Advanced Configuration and Power Interface daemon: " + start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events -s /var/run/.acpid.socket + echo "acpid." + ;; + stop) + echo -n "Stopping Advanced Configuration and Power Interface daemon: " + start-stop-daemon -K -x /usr/sbin/acpid + echo "acpid." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/acpid/acpid-1.0.3/init b/acpid/acpid-1.0.3/init index e69de29bb2..4937e71e9f 100644 --- a/acpid/acpid-1.0.3/init +++ b/acpid/acpid-1.0.3/init @@ -0,0 +1,26 @@ +#! /bin/sh -e + +test -x /usr/sbin/acpid || exit 0 +test -d /proc/acpi || exit 0 + +case "$1" in + start) + echo -n "Starting Advanced Configuration and Power Interface daemon: " + start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events -s /var/run/.acpid.socket + echo "acpid." + ;; + stop) + echo -n "Stopping Advanced Configuration and Power Interface daemon: " + start-stop-daemon -K -x /usr/sbin/acpid + echo "acpid." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/adns/adns-1.0/configure.patch b/adns/adns-1.0/configure.patch index e69de29bb2..77f1e531ea 100644 --- a/adns/adns-1.0/configure.patch +++ b/adns/adns-1.0/configure.patch @@ -0,0 +1,137 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null ++++ adns-1.0/acinclude.m4 +@@ -0,0 +1,70 @@ ++# aclocal.m4 - package-specific macros for autoconf ++# ++# This file is ++# Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk> ++# ++# It is part of adns, which is ++# Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk> ++# Copyright (C) 1999-2000 Tony Finch <dot@dotat.at> ++# ++# This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson ++# ++# 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, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>) ++define(DPKG_CACHED_TRY_COMPILE,[ ++ AC_MSG_CHECKING($1) ++ AC_CACHE_VAL($2,[ ++ AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no]) ++ ]) ++ if test "x$$2" = xyes; then ++ true ++ $5 ++ else ++ true ++ $6 ++ fi ++]) ++ ++define(ADNS_C_GCCATTRIB,[ ++ DPKG_CACHED_TRY_COMPILE(__attribute__((,,)),adns_cv_c_attribute_supported,, ++ [extern int testfunction(int x) __attribute__((,,))], ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_GNUC25_ATTRIB) ++ DPKG_CACHED_TRY_COMPILE(__attribute__((noreturn)),adns_cv_c_attribute_noreturn,, ++ [extern int testfunction(int x) __attribute__((noreturn))], ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_GNUC25_NORETURN), ++ AC_MSG_RESULT(no)) ++ DPKG_CACHED_TRY_COMPILE(__attribute__((const)),adns_cv_c_attribute_const,, ++ [extern int testfunction(int x) __attribute__((const))], ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_GNUC25_CONST), ++ AC_MSG_RESULT(no)) ++ DPKG_CACHED_TRY_COMPILE(__attribute__((format...)),adns_cv_attribute_format,, ++ [extern int testfunction(char *y, ...) __attribute__((format(printf,1,2)))], ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_GNUC25_PRINTFFORMAT), ++ AC_MSG_RESULT(no)), ++ AC_MSG_RESULT(no)) ++]) ++ ++define(ADNS_C_GETFUNC,[ ++ AC_CHECK_FUNC([$1],,[ ++ AC_CHECK_LIB([$2],[$1],[$3],[ ++ AC_MSG_ERROR([cannot find library function $1]) ++ ]) ++ ]) ++]) +--- adns-1.0/configure.in~configure ++++ adns-1.0/configure.in +@@ -21,24 +21,10 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +-AC_INIT(src/adns.h) ++AC_INIT ++AC_CONFIG_SRCDIR([src/adns.h]) + AC_CONFIG_HEADER(src/config.h) + +-dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>) +-define(DPKG_CACHED_TRY_COMPILE,[ +- AC_MSG_CHECKING($1) +- AC_CACHE_VAL($2,[ +- AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no]) +- ]) +- if test "x$$2" = xyes; then +- true +- $5 +- else +- true +- $6 +- fi +-]) +- + AC_MSG_CHECKING(whether you requested dynamic linking) + AC_SUBST(ENABLE_DYNAMIC) + AC_ARG_ENABLE(dynamic, +@@ -81,15 +67,13 @@ + + AC_MSG_CHECKING(for INADDR_LOOPBACK) + AC_CACHE_VAL(adns_cv_decl_inaddrloopback,[ +- AC_TRY_COMPILE([ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +- ],[ ++ ]], [[ + INADDR_LOOPBACK; +- ], +- adns_cv_decl_inaddrloopback=yes, +- adns_cv_decl_inaddrloopback=no)]) ++ ]])],[adns_cv_decl_inaddrloopback=yes],[adns_cv_decl_inaddrloopback=no])]) + if test "$adns_cv_decl_inaddrloopback" = yes; then + AC_MSG_RESULT(found) + else +@@ -141,7 +125,7 @@ + MKSHLIB_2='' + MKSHLIB_3='-lc' + +-AC_OUTPUT( +- settings.make Makefile ++AC_CONFIG_FILES([settings.make Makefile + src/Makefile client/Makefile dynamic/Makefile regress/Makefile +-) ++]) ++AC_OUTPUT diff --git a/adns/adns-1.0/fixparsedomainflags.patch b/adns/adns-1.0/fixparsedomainflags.patch index e69de29bb2..2d90de0a8a 100644 --- a/adns/adns-1.0/fixparsedomainflags.patch +++ b/adns/adns-1.0/fixparsedomainflags.patch @@ -0,0 +1,11 @@ +--- adns-1.0/src/parse.c~fixparsedomainflags 2000-09-16 20:24:24.000000000 -0400 ++++ adns-1.0/src/parse.c 2004-05-08 22:14:44.000000000 -0400 +@@ -111,7 +111,7 @@ + } + + adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu, +- vbuf *vb, adns_queryflags flags, ++ vbuf *vb, parsedomain_flags flags, + const byte *dgram, int dglen, int *cbyte_io, int max) { + findlabel_state fls; + diff --git a/apache/apache-2.0.48/configure.patch b/apache/apache-2.0.48/configure.patch index e69de29bb2..13217ed4b9 100644 --- a/apache/apache-2.0.48/configure.patch +++ b/apache/apache-2.0.48/configure.patch @@ -0,0 +1,390 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- httpd-2.0.48/./configure.in~configure ++++ httpd-2.0.48/./configure.in +@@ -4,8 +4,9 @@ + dnl Use ./buildconf to produce a configure script + dnl + +-AC_PREREQ(2.13) +-AC_INIT(ABOUT_APACHE) ++AC_PREREQ(2.57) ++AC_INIT ++AC_CONFIG_SRCDIR([ABOUT_APACHE]) + + AC_CONFIG_HEADER(include/ap_config_auto.h) + AC_CONFIG_AUX_DIR(build) +@@ -55,7 +56,7 @@ + dnl shared library support for these packages doesn't currently + dnl work on some platforms + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + + orig_prefix="$prefix" + +@@ -209,7 +210,7 @@ + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-solaris2*) +- dnl This is a hack -- we should be using AC_TRY_RUN instead ++ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead + ap_platform_runtime_link_flag="-R" + dnl solaris 8 and above don't have a thundering herd + dnl not sure about rev's before this one. +@@ -286,7 +287,7 @@ + dnl ## Check for typedefs, structures, and compiler characteristics. + + AC_C_CONST +-if test "$ac_cv_prog_gcc" = "yes"; then ++if test "$ac_cv_c_compiler_gnu" = "yes"; then + APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) + fi + +@@ -305,9 +306,8 @@ + + dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs + AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, +-[AC_TRY_COMPILE([#include <sys/types.h> +-#include <time.h>], [struct tm tm; tm.tm_gmtoff;], +- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) ++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ++#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) + if test "$ac_cv_struct_tm_gmtoff" = "yes"; then + AC_DEFINE(HAVE_GMTOFF) + fi +--- httpd-2.0.48/./srclib/apr/configure.in~configure ++++ httpd-2.0.48/./srclib/apr/configure.in +@@ -4,7 +4,8 @@ + dnl Process this file with autoconf to produce a configure script. + dnl Use ./buildconf to prepare build files and run autoconf for APR. + +-AC_INIT(build/apr_common.m4) ++AC_INIT ++AC_CONFIG_SRCDIR([build/apr_common.m4]) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) + +@@ -29,7 +30,7 @@ + dnl + APR_CONFIG_NICE(config.nice) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + echo "Configuring APR library" + echo "Platform: $host" + +@@ -532,18 +533,14 @@ + dnl Linux is silly as it has pthread_rwlock_init defined + dnl but keeps the pthread_rwlock_t structure hidden unless + dnl special things are defined. +- AC_TRY_COMPILE([#include <sys/types.h> +-#include <pthread.h>], +- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], +- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ++#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) + if test "$ac_cv_struct_pthread_rw" = "no"; then +- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500 + #define _BSD_SOURCE + #define _SVID_SOURCE + #include <sys/types.h> +-#include <pthread.h>], +- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], +- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) ++#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) + if test "$ac_cv_struct_pthread_rw" = "yes"; then + APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE]) + APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE]) +@@ -624,7 +621,7 @@ + if test "$ac_cv_func_mmap" = "yes" && + test "$ac_cv_file__dev_zero" = "yes"; then + AC_MSG_CHECKING(for mmap that can map /dev/zero) +- AC_TRY_RUN([ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -647,7 +644,7 @@ + return 3; + } + return 0; +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) ++ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no]) + + AC_MSG_RESULT($ac_cv_file__dev_zero) + fi +@@ -852,7 +849,8 @@ + AC_SUBST(sendfile) + + AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) +-AC_DECL_SYS_SIGLIST ++AC_CHECK_DECLS([sys_siglist]) ++ + + AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) + APR_CHECK_INET_ADDR +@@ -961,12 +959,11 @@ + # being included by itself. Check for <netinet/tcp.h> manually, + # including another header file first. + AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h], +-[AC_TRY_CPP( +-[#ifdef HAVE_NETINET_IN_H ++[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #include <netinet/tcp.h> +-], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])]) ++]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])]) + if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then + netinet_tcph=1 + AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present]) +@@ -1039,7 +1036,7 @@ + if test "x$ac_cv_sizeof_voidp" != "x"; then + voidp_size=$ac_cv_sizeof_voidp + else +- AC_ERROR([Cannot determine size of void*]) ++ AC_MSG_ERROR([Cannot determine size of void*]) + fi + + dnl Checks for integer size +@@ -1378,7 +1375,7 @@ + fi + + AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[ +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +@@ -1388,10 +1385,10 @@ + limit.rlim_cur = 0; + limit.rlim_max = 0; + exit(0); +-}], [ +- ac_cv_struct_rlimit=yes ], [ +- ac_cv_struct_rlimit=no ], [ +- ac_cv_struct_rlimit=no ] ) ] ) ++}]])],[ ++ ac_cv_struct_rlimit=yes ],[ ++ ac_cv_struct_rlimit=no ],[ ++ ac_cv_struct_rlimit=no ]) ] ) + struct_rlimit=0 + test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 + AC_SUBST(struct_rlimit) +@@ -1405,7 +1402,7 @@ + + # Some systems return ENOSYS from sem_open. + AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[ +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <errno.h> + #include <stdlib.h> + #include <fcntl.h> +@@ -1424,22 +1421,21 @@ + sem_close(psem); + sem_unlink(sem_name); + exit(0); +-}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no], +-[ac_cv_func_sem_open=no])]) ++}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])]) + + # It's stupid, but not all platforms have union semun, even those that need it. + AC_MSG_CHECKING(for union semun in sys/sem.h) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> + #include <sys/ipc.h> + #include <sys/sem.h> +-],[ ++]], [[ + union semun arg; + semctl(0, 0, 0, arg); +-], [have_union_semun="1" union_semun=yes ] +-msg=yes, [ ++]])],[have_union_semun="1" union_semun=yes ++msg=yes],[ + have_union_semun="0" +-msg=no ] ) ++msg=no ]) + AC_MSG_RESULT([$msg]) + AC_SUBST(have_union_semun) + +@@ -1461,7 +1457,7 @@ + # Linux and older versions of AIX have this problem. + APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [ + AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [ +- AC_TRY_RUN([ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + #include <pthread.h> + int main() +@@ -1479,7 +1475,7 @@ + if (pthread_mutex_destroy(&mutex)) + exit(5); + exit(0); +- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])]) ++ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])]) + # Override detection of pthread_mutexattr_setpshared + ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works]) + +@@ -1488,15 +1484,15 @@ + if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then + AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT], + [apr_cv_setrobust_with_prio_inherit], [ +- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT + #include <sys/types.h> +-#include <pthread.h>],[ ++#include <pthread.h>]], [[ + int main() + { + pthread_mutexattr_t attr; + pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); + return 0; +- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])]) ++ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])]) + if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then + ac_cv_func_pthread_mutexattr_setrobust_np=yes + APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT) +@@ -1664,7 +1660,7 @@ + if test -r "$apr_devrandom"; then + rand="1" + else +- AC_ERROR([$apr_devrandom not found or unreadable.]) ++ AC_MSG_ERROR([$apr_devrandom not found or unreadable.]) + fi + fi + +@@ -1700,9 +1696,8 @@ + dnl ----------------------------- Checking for Time Support + echo "${nl}Checking for Time Support..." + AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, +-[AC_TRY_COMPILE([#include <sys/types.h> +-#include <time.h>], [struct tm tm; tm.tm_gmtoff;], +- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) ++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ++#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) + + if test "$ac_cv_struct_tm_gmtoff" = "yes"; then + AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field]) +@@ -1711,14 +1706,14 @@ + dnl ----------------------------- Checking for Networking Support + echo "${nl}Checking for Networking support..." + AC_MSG_CHECKING(for in_addr in netinet/in.h) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> + #include <netinet/in.h> +-],[ ++]], [[ + struct in_addr arg; + arg.s_addr = htonl(INADDR_ANY); +-], [ have_in_addr="1" +-msg=yes ] , [ have_in_addr="0" ++]])],[ have_in_addr="1" ++msg=yes ],[ have_in_addr="0" + msg=no ]) + AC_MSG_RESULT([$msg]) + +@@ -1920,12 +1915,13 @@ + dir=include/arch/unix + test -d $dir || $MKDIR $dir + +-AC_OUTPUT([ ++AC_CONFIG_FILES([ + $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 + include/apr.h + build/apr_rules.mk + apr-config +-],[ ++]) ++AC_CONFIG_COMMANDS([default],[[ + for i in $SAVE_FILES; do + if cmp -s $i $i.save 2>/dev/null; then + mv $i.save $i +@@ -1934,7 +1930,8 @@ + rm -f $i.save + done + chmod +x apr-config +-]) ++]],[[]]) ++AC_OUTPUT + + dnl ----------------------------- Fixup Makefiles for VPATH support + +--- httpd-2.0.48/./srclib/pcre/configure.in~configure ++++ httpd-2.0.48/./srclib/pcre/configure.in +@@ -3,7 +3,8 @@ + dnl This is required at the start; the name is the name of a file + dnl it should be seeing, to verify it is in the same directory. + +-AC_INIT(dftables.c) ++AC_INIT ++AC_CONFIG_SRCDIR([dftables.c]) + + dnl Arrange to build config.h from config.in. Note that pcre.h is + dnl built differently, as it is just a "substitution" file. +@@ -101,4 +102,6 @@ + AC_SUBST(PCRE_POSIXLIB_VERSION) + + dnl This must be last; it determines what files are written as well as config.h +-AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config]) ++AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config]) ++AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]]) ++AC_OUTPUT +--- httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in~configure ++++ httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in +@@ -10,7 +10,8 @@ + dnl in the file COPYING that comes with this distribution. + dnl + +-AC_INIT(Makefile.in) ++AC_INIT ++AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR(conftools) + + dnl +@@ -45,7 +46,7 @@ + + AC_CONFIG_HEADER(config.h) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + case "$host_alias" in + *os2*) + # Use a custom made libtool replacement +@@ -106,4 +107,5 @@ + + AC_CHECK_FUNCS(memmove bcopy) + +-AC_OUTPUT(Makefile lib/Makefile lib/expat.h) ++AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h]) ++AC_OUTPUT +--- httpd-2.0.48/./srclib/apr-util/configure.in~configure ++++ httpd-2.0.48/./srclib/apr-util/configure.in +@@ -2,8 +2,9 @@ + dnl Process this file with autoconf to produce a configure script + dnl + +-AC_PREREQ(2.13) +-AC_INIT(export_vars.sh.in) ++AC_PREREQ(2.57) ++AC_INIT ++AC_CONFIG_SRCDIR([export_vars.sh.in]) + + AC_CONFIG_HEADER(include/private/apu_config.h) + AC_CONFIG_AUX_DIR(build) +@@ -30,7 +31,7 @@ + USE_VPATH=1 + fi + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + + dnl + dnl compute the top directory of the build diff --git a/apache/apache-2.0.48/pcre-configure.patch b/apache/apache-2.0.48/pcre-configure.patch index e69de29bb2..0460d17456 100644 --- a/apache/apache-2.0.48/pcre-configure.patch +++ b/apache/apache-2.0.48/pcre-configure.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure ++++ httpd-2.0.47/srclib/pcre/configure.in +@@ -72,7 +72,8 @@ + AC_ARG_ENABLE(newline-is-cr, + [ --enable-newline-is-cr use CR as the newline character], + if test "$enableval" = "yes"; then +- NEWLINE=-DNEWLINE=13 ++ AC_DEFINE(NEWLINE, 13) ++# NEWLINE=-DNEWLINE=13 + fi + ) + +@@ -81,7 +82,8 @@ + AC_ARG_ENABLE(newline-is-lf, + [ --enable-newline-is-lf use LF as the newline character], + if test "$enableval" = "yes"; then +- NEWLINE=-DNEWLINE=10 ++ AC_DEFINE(NEWLINE, 10) ++# NEWLINE=-DNEWLINE=10 + fi + ) + +@@ -91,7 +93,7 @@ + AC_SUBST(HAVE_STRERROR) + AC_SUBST(LIBTOOL) + AC_SUBST(LIBSUFFIX) +-AC_SUBST(NEWLINE) ++#AC_SUBST(NEWLINE) + AC_SUBST(UTF8) + AC_SUBST(PCRE_MAJOR) + AC_SUBST(PCRE_MINOR) diff --git a/apmd/apmd-3.2.2/apmd_proxy b/apmd/apmd-3.2.2/apmd_proxy index e69de29bb2..c48ee4e5d5 100644 --- a/apmd/apmd-3.2.2/apmd_proxy +++ b/apmd/apmd-3.2.2/apmd_proxy @@ -0,0 +1,91 @@ +#!/bin/sh +# +# apmd_proxy - program dispatcher for APM daemon +# +# Written by Craig Markwardt (craigm@lheamail.gsfc.nasa.gov) 21 May 1999 +# Modified for Debian by Avery Pennarun +# +# This shell script is called by the APM daemon (apmd) when a power +# management event occurs. Its first and second arguments describe the +# event. For example, apmd will call "apmd_proxy suspend system" just +# before the system is suspended. +# +# Here are the possible arguments: +# +# start - APM daemon has started +# stop - APM daemon is shutting down +# suspend critical - APM system indicates critical suspend (++) +# suspend system - APM system has requested suspend mode +# suspend user - User has requested suspend mode +# standby system - APM system has requested standby mode +# standby user - User has requested standby mode +# resume suspend - System has resumed from suspend mode +# resume standby - System has resumed from standby mode +# resume critical - System has resumed from critical suspend +# change battery - APM system reported low battery +# change power - APM system reported AC/battery change +# change time - APM system reported time change (*) +# change capability - APM system reported config. change (+) +# +# (*) - APM daemon may be configured to not call these sequences +# (+) - Available if APM kernel supports it. +# (++) - "suspend critical" is never passed to apmd from the kernel, +# so we will never see it here. Scripts that process "resume +# critical" events need to take this into account. +# +# It is the proxy script's responsibility to examine the APM status +# (via /proc/apm) or other status and to take appropriate actions. +# For example, the script might unmount network drives before the +# machine is suspended. +# +# In Debian, the usual way of adding functionality to the proxy is to +# add a script to /etc/apm/event.d. This script will be called by +# apmd_proxy (via run-parts) with the same arguments. +# +# If it is important that a certain set of script be run in a certain +# order on suspend and in a different order on resume, then put all +# the scripts in /etc/apm/scripts.d instead of /etc/apm/event.d and +# symlink to these from /etc/apm/suspend.d, /etc/apm/resume.d and +# /etc/apm/other.d using names whose lexicographical order is the same +# as the desired order of execution. +# +# If the kernel's APM driver supports it, apmd_proxy can return a non-zero +# exit status on suspend and standby events, indicating that the suspend +# or standby event should be rejected. +# +# ******************************************************************* + +set -e + +# The following doesn't yet work, because current kernels (up to at least +# 2.4.20) do not support rejection of APM events. Supporting this would +# require substantial modifications to the APM driver. We will re-enable +# this feature if the driver is ever modified. -- cph@debian.org +# +#SUSPEND_ON_AC=false +#[ -r /etc/apm/apmd_proxy.conf ] && . /etc/apm/apmd_proxy.conf +# +#if [ "${SUSPEND_ON_AC}" = "false" -a "${2}" = "system" ] \ +# && on_ac_power >/dev/null; then +# # Reject system suspends and standbys if we are on AC power +# exit 1 # Reject (NOTE kernel support must be enabled) +#fi + +if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then + run-parts -a "${1}" -a "${2}" /etc/apm/event.d + if [ -d /etc/apm/suspend.d ]; then + run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d + fi +elif [ "${1}" = "resume" ]; then + if [ -d /etc/apm/resume.d ]; then + run-parts -a "${1}" -a "${2}" /etc/apm/resume.d + fi + run-parts -a "${1}" -a "${2}" /etc/apm/event.d +else + run-parts -a "${1}" -a "${2}" /etc/apm/event.d + if [ -d /etc/apm/other.d ]; then + run-parts -a "${1}" -a "${2}" /etc/apm/other.d + fi +fi + +exit 0 diff --git a/apmd/apmd-3.2.2/apmwrapper b/apmd/apmd-3.2.2/apmwrapper index e69de29bb2..64e02d408b 100644 --- a/apmd/apmd-3.2.2/apmwrapper +++ b/apmd/apmd-3.2.2/apmwrapper @@ -0,0 +1,9 @@ +#!/bin/sh + +if ( uname -r | grep -q embedix ) && \ + [ ".$@" = ".-s" -o ".$@" = ".--suspend" ]; then + killall -USR1 apmd || /usr/bin/apm.orig -s +else + /usr/bin/apm.orig "$@" +fi + diff --git a/apmd/apmd-3.2.2/debian.patch b/apmd/apmd-3.2.2/debian.patch index e69de29bb2..d49e524bbd 100644 --- a/apmd/apmd-3.2.2/debian.patch +++ b/apmd/apmd-3.2.2/debian.patch @@ -0,0 +1,54 @@ +--- apmd-3.2.2.orig/apmd.c ++++ apmd-3.2.2/apmd.c +@@ -343,7 +343,7 @@ + /* parent */ + int status, retval; + ssize_t len; +- time_t time_limit; ++ time_t countdown; + + if (pid < 0) { + /* Couldn't fork */ +@@ -356,8 +356,9 @@ + /* Capture the child's output, if any, but only until it terminates */ + close(fds[1]); + fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK); +- time_limit = time(0) + proxy_timeout; ++ countdown = proxy_timeout; + do { ++ countdown -= 1; + while ((len = read(fds[0], line, sizeof(line)-1)) > 0) { + line[len] = 0; + APMD_SYSLOG(LOG_INFO, "+ %s", line); +@@ -372,16 +373,16 @@ + goto proxy_done; + } + +- sleep(1); ++ while (sleep(1) > 0) ; + } while ( +- (time(0) < time_limit) ++ (countdown >= 0) + || (proxy_timeout < 0) + ); + + APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout); + + kill(pid, SIGTERM); +- time_limit = time(0) + 5; ++ countdown = 5; + do { + retval = waitpid(pid, &status, WNOHANG); + if (retval == pid) +@@ -392,9 +393,9 @@ + goto proxy_done; + } + +- sleep(1); ++ while (sleep(1) > 0) ; + +- } while (time(0) < time_limit); ++ } while (countdown >= 0); + + kill(pid, SIGKILL); + status = __W_EXITCODE(0, SIGKILL); diff --git a/apmd/apmd-3.2.2/default b/apmd/apmd-3.2.2/default index e69de29bb2..4b7965abf8 100644 --- a/apmd/apmd-3.2.2/default +++ b/apmd/apmd-3.2.2/default @@ -0,0 +1,8 @@ +# +# Default for /etc/init.d/apmd +# + +# As apmd can be called with arguments, we use the following variable +# to store them, e.g., APMD="-w 5 -p 2". +# See the manual page apmd(8) for details. +APMD="--proxy-timeout 30" diff --git a/apmd/apmd-3.2.2/devfs.patch b/apmd/apmd-3.2.2/devfs.patch index e69de29bb2..b11e01929b 100644 --- a/apmd/apmd-3.2.2/devfs.patch +++ b/apmd/apmd-3.2.2/devfs.patch @@ -0,0 +1,11 @@ +--- apmd-3.2.0.orig/apm.h~devfs ++++ apmd-3.2.0.orig/apm.h +@@ -24,7 +24,7 @@ + #include <sys/types.h> + + #define APM_PROC "/proc/apm" +-#define APM_DEVICE "/dev/apm_bios" ++#define APM_DEVICE "/dev/misc/apm_bios" + + #define APM_DEV "/proc/devices" + #define APM_NAME "apm_bios" diff --git a/apmd/apmd-3.2.2/hwclock b/apmd/apmd-3.2.2/hwclock index e69de29bb2..a1c1c2294c 100644 --- a/apmd/apmd-3.2.2/hwclock +++ b/apmd/apmd-3.2.2/hwclock @@ -0,0 +1,16 @@ +#!/bin/sh +# Preserve the system clock around suspend/resume. + +INIT="/etc/init.d/hwclock.sh" +[ -x "${INIT}" ] || exit 0 + +case "${1},${2}" in +(suspend,*) + "${INIT}" stop + ;; +(resume,suspend) + "${INIT}" start + ;; +esac + +exit 0 diff --git a/apmd/apmd-3.2.2/init b/apmd/apmd-3.2.2/init index e69de29bb2..f1098a752d 100644 --- a/apmd/apmd-3.2.2/init +++ b/apmd/apmd-3.2.2/init @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Start or stop the Advanced Power Management daemon. +# +# Written by Dirk Eddelbuettel <edd@debian.org> +# Greatly modified by Avery Pennarun <apenwarr@debian.org> +# +# I think this script is now free of bashisms. +# Please correct me if I'm wrong! + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -f /etc/default/rcS ] && . /etc/default/rcS +[ -f /etc/default/apmd ] && . /etc/default/apmd + +case "$1" in + start) + echo -n "Starting advanced power management daemon: " + start-stop-daemon -S -x /usr/sbin/apmd -- \ + -P /etc/apm/apmd_proxy $APMD + if [ $? = 0 ]; then + echo "apmd." + else + echo "(failed.)" + fi + ;; + stop) + echo -n "Stopping advanced power management daemon: " + start-stop-daemon -K \ + -x /usr/sbin/apmd + echo "apmd." + ;; + restart|force-reload) + $0 stop + $0 start + exit + ;; + *) + echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/apmd/apmd-3.2.2/logcheck.ignore.paranoid b/apmd/apmd-3.2.2/logcheck.ignore.paranoid index e69de29bb2..de37f01a2d 100644 --- a/apmd/apmd-3.2.2/logcheck.ignore.paranoid +++ b/apmd/apmd-3.2.2/logcheck.ignore.paranoid @@ -0,0 +1,13 @@ +apmd\[[0-9]+\]: (Normal|Standby|Critical) Resume +apmd\[[0-9]+\]: (Now using|Using) (AC|battery|backup) power +apmd\[[0-9]+\]: (System|User) (Standby|Suspend) +apmd\[[0-9]+\]: (apmd_)?call_proxy: +apmd\[[0-9]+\]: Battery: [0-9]+%, +apmd\[[0-9]+\]: Battery: absent +apmd\[[0-9]+\]: Capability Change +apmd\[[0-9]+\]: Exiting +apmd\[[0-9]+\]: Performing APM status check +apmd\[[0-9]+\]: Suspending now +apmd\[[0-9]+\]: Update Time +apmd\[[0-9]+\]: Version: apmd [0-9.]+, (apm )?driver [0-9.]+, APM BIOS [0-9.]+ +apmd\[[0-9]+\]: apmd [0-9.]+ interfacing with apm driver [0-9.]+ and APM BIOS [0-9.]+ diff --git a/apmd/apmd-3.2.2/workaround.patch b/apmd/apmd-3.2.2/workaround.patch index e69de29bb2..19cf073115 100644 --- a/apmd/apmd-3.2.2/workaround.patch +++ b/apmd/apmd-3.2.2/workaround.patch @@ -0,0 +1,55 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- apmd-3.2.2.orig/apmd.c~workaround.patch ++++ apmd-3.2.2.orig/apmd.c +@@ -158,6 +158,7 @@ + static int quiet_bios_batlow; /* = 0 */ + static int verbosity = DEFAULT_VERBOSITY; + static int warn_level = 10; ++static int sleep_now = 0; /* ntp */ + + static uid_t apmd_uid = 0; + static int apmd_fd = -1; +@@ -942,6 +943,12 @@ + exit(0); + } + ++/* ntp */ ++static void sig_usr1(int sig) ++{ ++ sleep_now = 1; ++} ++ + int main(int argc, char **argv) + { + int c; +@@ -1151,6 +1158,8 @@ + openlog("apmd", (verbosity>=LOG_DEBUG)?LOG_PERROR:0 | LOG_PID | LOG_CONS, LOG_DAEMON); + + /* Set up signal handler */ ++ if (signal(SIGUSR1, SIG_IGN) != SIG_IGN) ++ signal(SIGUSR1, sig_usr1); /* ntp */ + if (signal(SIGINT, SIG_IGN) != SIG_IGN) + signal(SIGINT, sig_handler); + if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) +@@ -1230,9 +1239,16 @@ + + for (;;) + { +- int num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS); ++ int num_events; + int e, a; + ++ /* ntp */ ++ if (sleep_now) { ++ sleep_now = 0; ++ handle_event(APM_USER_SUSPEND, &apminfo); ++ } ++ ++ num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS); + apm_read(&apminfo); + + if (num_events == 0) { diff --git a/application-registry/application-registry-0.1/abiword.applications b/application-registry/application-registry-0.1/abiword.applications index e69de29bb2..28a6e9cf2b 100644 --- a/application-registry/application-registry-0.1/abiword.applications +++ b/application-registry/application-registry-0.1/abiword.applications @@ -0,0 +1,7 @@ +abiword + command=AbiWord-2.0 + name=AbiWord + can_open_multiple_files=true + expects_uris=false + requires_terminal=false + mime_types=text/*,text/abiword,application/x-abiword,application/rtf,application/msword diff --git a/application-registry/application-registry-0.1/firefox.applications b/application-registry/application-registry-0.1/firefox.applications index e69de29bb2..d0fd3ccc73 100644 --- a/application-registry/application-registry-0.1/firefox.applications +++ b/application-registry/application-registry-0.1/firefox.applications @@ -0,0 +1,8 @@ +firefox + command=firefox + name=Firefox Browser + can_open_multiple_files=true + expects_uris=true + requires_terminal=false + supported_uri_schemes=file,http,ftp,telnet,gopher + mime_types=text/html,x-directory/webdav,x-directory/webdav-prefer-directory,image/gif,image/jpeg,text/xml diff --git a/application-registry/application-registry-0.1/gnumeric.applications b/application-registry/application-registry-0.1/gnumeric.applications index e69de29bb2..9a878047ff 100644 --- a/application-registry/application-registry-0.1/gnumeric.applications +++ b/application-registry/application-registry-0.1/gnumeric.applications @@ -0,0 +1,7 @@ +gnumeric + command=gnumeric + name=Gnumeric + can_open_multiple_files=true + expects_uris=false + requires_terminal=false + mime_types=application/x-gnumeric,application/x-applix-spreadsheet,application/vnd.ms-excel,application/vnd.lotus-1-2-3,application/x-oleo,application/x-xbase,text/spreadsheet,text/x-comma-separated-values,text/tab-separated-values diff --git a/application-registry/application-registry-0.1/gpe-calendar.applications b/application-registry/application-registry-0.1/gpe-calendar.applications index e69de29bb2..9e0c4eb175 100644 --- a/application-registry/application-registry-0.1/gpe-calendar.applications +++ b/application-registry/application-registry-0.1/gpe-calendar.applications @@ -0,0 +1,7 @@ +gpe-calendar + requires_terminal=false + expects_uris=false + command=gpe-calendar -i + can_open_multiple_files=false + name=Calendar + mime_types=text/x-vcalendar diff --git a/application-registry/application-registry-0.1/gpe-contacts.applications b/application-registry/application-registry-0.1/gpe-contacts.applications index e69de29bb2..b68ee9af20 100644 --- a/application-registry/application-registry-0.1/gpe-contacts.applications +++ b/application-registry/application-registry-0.1/gpe-contacts.applications @@ -0,0 +1,7 @@ +gpe-contacts + requires_terminal=false + expects_uris=false + command=gpe-contacts -i + can_open_multiple_files=false + name=Contacts + mime_types=text/vcard diff --git a/application-registry/application-registry-0.1/ipkg.applications b/application-registry/application-registry-0.1/ipkg.applications index e69de29bb2..11cb5fcbce 100644 --- a/application-registry/application-registry-0.1/ipkg.applications +++ b/application-registry/application-registry-0.1/ipkg.applications @@ -0,0 +1,7 @@ +ipkg + command=ipkg install + name=Install Package (ipkg) + can_open_multiple_files=true + expects_uris=false + requires_terminal=true + mime_types=application/x-ipk diff --git a/appweb/appweb-1.0.0/charsignedness.patch b/appweb/appweb-1.0.0/charsignedness.patch index e69de29bb2..857dfa18aa 100644 --- a/appweb/appweb-1.0.0/charsignedness.patch +++ b/appweb/appweb-1.0.0/charsignedness.patch @@ -0,0 +1,11 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/http/crypt.cpp 2004-01-09 12:49:47.000000000 -0500 ++++ appWeb-1.0.0/http/crypt.cpp 2004-01-28 20:29:24.000000000 -0500 +@@ -121,7 +121,7 @@ + // + // Decode map + // +-static char decodeMap[] = { ++static signed char decodeMap[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/appweb/appweb-1.0.0/makerules.patch b/appweb/appweb-1.0.0/makerules.patch index e69de29bb2..ccf2caa005 100644 --- a/appweb/appweb-1.0.0/makerules.patch +++ b/appweb/appweb-1.0.0/makerules.patch @@ -0,0 +1,23 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/make.rules 2004-01-09 12:49:45.000000000 -0500 ++++ appWeb-1.0.0/make.rules 2004-01-28 20:28:09.000000000 -0500 +@@ -119,14 +119,13 @@ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ + home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; echo " \# make \"$$T\" in `pwd` " ; \ +- echo " cd $$i" ; unset CFLAGS ; \ +- echo " $(MAKE) -S $(MAKEF) DEBUG=$(DEBUG) \ +- MAKEFLAGS=$(MAKEFLAGS) $$T" ; \ +- $(MAKE) --no-print-directory -S $(MAKEF) DEBUG="$(DEBUG)" \ +- MAKEFLAGS=$(MAKEFLAGS) $$T ; \ ++ unset CFLAGS ; \ ++ echo " $(MAKE) -C $$i -S $(MAKEF) DEBUG=$(DEBUG) \ ++ $$T" ; \ ++ $(MAKE) --no-print-directory -C $$i -S $(MAKEF) DEBUG="$(DEBUG)" \ ++ $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ diff --git a/appweb/appweb-1.0.1/charsignedness.patch b/appweb/appweb-1.0.1/charsignedness.patch index e69de29bb2..857dfa18aa 100644 --- a/appweb/appweb-1.0.1/charsignedness.patch +++ b/appweb/appweb-1.0.1/charsignedness.patch @@ -0,0 +1,11 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/http/crypt.cpp 2004-01-09 12:49:47.000000000 -0500 ++++ appWeb-1.0.0/http/crypt.cpp 2004-01-28 20:29:24.000000000 -0500 +@@ -121,7 +121,7 @@ + // + // Decode map + // +-static char decodeMap[] = { ++static signed char decodeMap[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/appweb/appweb-1.0.1/makerules.patch b/appweb/appweb-1.0.1/makerules.patch index e69de29bb2..ccf2caa005 100644 --- a/appweb/appweb-1.0.1/makerules.patch +++ b/appweb/appweb-1.0.1/makerules.patch @@ -0,0 +1,23 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/make.rules 2004-01-09 12:49:45.000000000 -0500 ++++ appWeb-1.0.0/make.rules 2004-01-28 20:28:09.000000000 -0500 +@@ -119,14 +119,13 @@ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ + home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; echo " \# make \"$$T\" in `pwd` " ; \ +- echo " cd $$i" ; unset CFLAGS ; \ +- echo " $(MAKE) -S $(MAKEF) DEBUG=$(DEBUG) \ +- MAKEFLAGS=$(MAKEFLAGS) $$T" ; \ +- $(MAKE) --no-print-directory -S $(MAKEF) DEBUG="$(DEBUG)" \ +- MAKEFLAGS=$(MAKEFLAGS) $$T ; \ ++ unset CFLAGS ; \ ++ echo " $(MAKE) -C $$i -S $(MAKEF) DEBUG=$(DEBUG) \ ++ $$T" ; \ ++ $(MAKE) --no-print-directory -C $$i -S $(MAKEF) DEBUG="$(DEBUG)" \ ++ $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ diff --git a/appweb/appweb-1.0.2/charsignedness.patch b/appweb/appweb-1.0.2/charsignedness.patch index e69de29bb2..857dfa18aa 100644 --- a/appweb/appweb-1.0.2/charsignedness.patch +++ b/appweb/appweb-1.0.2/charsignedness.patch @@ -0,0 +1,11 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/http/crypt.cpp 2004-01-09 12:49:47.000000000 -0500 ++++ appWeb-1.0.0/http/crypt.cpp 2004-01-28 20:29:24.000000000 -0500 +@@ -121,7 +121,7 @@ + // + // Decode map + // +-static char decodeMap[] = { ++static signed char decodeMap[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/appweb/appweb-1.0.2/makerules.patch b/appweb/appweb-1.0.2/makerules.patch index e69de29bb2..ccf2caa005 100644 --- a/appweb/appweb-1.0.2/makerules.patch +++ b/appweb/appweb-1.0.2/makerules.patch @@ -0,0 +1,23 @@ +--- tmp/base/appweb-1.0.0-r0/appWeb-1.0.0/make.rules 2004-01-09 12:49:45.000000000 -0500 ++++ appWeb-1.0.0/make.rules 2004-01-28 20:28:09.000000000 -0500 +@@ -119,14 +119,13 @@ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ + home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; echo " \# make \"$$T\" in `pwd` " ; \ +- echo " cd $$i" ; unset CFLAGS ; \ +- echo " $(MAKE) -S $(MAKEF) DEBUG=$(DEBUG) \ +- MAKEFLAGS=$(MAKEFLAGS) $$T" ; \ +- $(MAKE) --no-print-directory -S $(MAKEF) DEBUG="$(DEBUG)" \ +- MAKEFLAGS=$(MAKEFLAGS) $$T ; \ ++ unset CFLAGS ; \ ++ echo " $(MAKE) -C $$i -S $(MAKEF) DEBUG=$(DEBUG) \ ++ $$T" ; \ ++ $(MAKE) --no-print-directory -C $$i -S $(MAKEF) DEBUG="$(DEBUG)" \ ++ $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ diff --git a/appweb/appweb-1.2.0/makerules.patch b/appweb/appweb-1.2.0/makerules.patch index e69de29bb2..55d3dd22d9 100644 --- a/appweb/appweb-1.2.0/makerules.patch +++ b/appweb/appweb-1.2.0/makerules.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- appWeb-1.2.0/make.rules~makerules 2004-06-28 14:50:23.000000000 -0500 ++++ appWeb-1.2.0/make.rules 2004-07-15 13:27:35.000000000 -0500 +@@ -61,24 +61,19 @@ + for i in $$D "" ; \ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ +- home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; \ +- echo " cd $$i" ; \ + set +e ; \ + unset COMPILE_SHARED EXPORT_OBJECTS _LDPATH ; \ + set -e ; \ + echo " \# $(MAKE) $$T" ; \ +- $(MAKE) --no-print-directory -S $$T ; \ ++ $(MAKE) -C $$i --no-print-directory -S $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ + exit 255 ; \ + fi ; \ +- echo " cd $$home" ; \ + fi ; \ +- cd $$home >/dev/null ;\ + done + + DO_RECURSE=[ -z "$$D" ] || $(RECURSE) diff --git a/appweb/appweb-1.2.0/nonrootinstall.patch b/appweb/appweb-1.2.0/nonrootinstall.patch index e69de29bb2..4227b76591 100644 --- a/appweb/appweb-1.2.0/nonrootinstall.patch +++ b/appweb/appweb-1.2.0/nonrootinstall.patch @@ -0,0 +1,57 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- appWeb-1.2.0/Makefile~nonrootinstall 2004-07-06 15:09:21.000000000 -0500 ++++ appWeb-1.2.0/Makefile 2004-07-15 13:45:32.000000000 -0500 +@@ -127,40 +127,33 @@ + # + # Installation targets + # +-install: install-rootCheck install-binary +- +-install-rootCheck: +- @if [ $(BLD_OS) != WIN -a `id -u` -ne 0 ] ; \ +- then \ +- echo "Must be root to install" ; \ +- exit 255 ; \ +- fi ++install: install-binary + +-install-release: install-rootCheck ++install-release: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall release + +-install-binary: install-rootCheck ++install-binary: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall binary + @echo -e " #\n # To start ${BLD_NAME}, run as root:\n #" + @echo -e " service ${BLD_PRODUCT} start\n" + +-install-dev: install-rootCheck ++install-dev: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall dev + +-install-doc: install-rootCheck ++install-doc: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall doc + +-install-samples: install-rootCheck ++install-samples: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall samples + +-install-source: install-rootCheck ++install-source: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall source + +-install-all: install-rootCheck ++install-all: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall \ + "release binary dev doc samples source" + +-uninstall: install-rootCheck ++uninstall: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeUninstall + + # diff --git a/aspell/aspell-0.50.5/makefile.patch b/aspell/aspell-0.50.5/makefile.patch index e69de29bb2..c16a32e3b9 100644 --- a/aspell/aspell-0.50.5/makefile.patch +++ b/aspell/aspell-0.50.5/makefile.patch @@ -0,0 +1,20 @@ +--- aspell-0.50.5/common/Makefile.am~ 2002-11-05 00:24:14.000000000 +0000 ++++ aspell-0.50.5/common/Makefile.am 2004-06-27 14:33:37.000000000 +0100 +@@ -4,7 +4,7 @@ + pkgdatadir = @pkgdatadir@ + pkglibdir = @pkglibdir@ + +-noinst_PROGRAMS = mk-dirs_h ++#noinst_PROGRAMS = mk-dirs_h + + dirs.h: mk-dirs_h + echo '#define PREFIX "${prefix}"' > dirs.h +@@ -12,7 +12,7 @@ + ./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h + ./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h + +-mk_dirs_h_SOURCES = mk-dirs_h.cpp ++#mk_dirs_h_SOURCES = mk-dirs_h.cpp + + config.cpp: dirs.h + diff --git a/aspell/aspell-0.50.5/mk-dirs_h.py b/aspell/aspell-0.50.5/mk-dirs_h.py index e69de29bb2..a487751e81 100644 --- a/aspell/aspell-0.50.5/mk-dirs_h.py +++ b/aspell/aspell-0.50.5/mk-dirs_h.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python + +import sys + +prefix=sys.argv[1] +key=sys.argv[2] +value=sys.argv[3] + +while prefix[-1] == '/': + prefix = prefix[:-2] + +plen = len(prefix) + +if value[:plen] == prefix: + value = value[plen:] + while value[0] == '/': + value = value[1:] + print "#define " + key + " \"<prefix:" + value + ">\"\n" +else: + print "#define " + key + " \"" + value + "\"\n" diff --git a/at/at-3.1.8/configure.patch b/at/at-3.1.8/configure.patch index e69de29bb2..af94e25dc2 100644 --- a/at/at-3.1.8/configure.patch +++ b/at/at-3.1.8/configure.patch @@ -0,0 +1,54 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- at-3.1.8/./configure.in~configure ++++ at-3.1.8/./configure.in +@@ -1,9 +1,10 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(at.c) ++AC_INIT ++AC_CONFIG_SRCDIR([at.c]) + AC_PREFIX_DEFAULT(/usr) + AC_CONFIG_HEADER(config.h) +-AC_PREREQ(2.7) ++AC_PREREQ(2.57) + + + VERSION="3.1.8" +@@ -38,19 +39,16 @@ + AC_MSG_RESULT(no) + ;; + esac ++if [ X"${cross_compiling}" = Xno ]; then + AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) +-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) ++ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) ++fi + + AC_MSG_CHECKING(__attribute__((noreturn))) +-AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_ATTRIBUTE_NORETURN), +- AC_MSG_RESULT(no) +-) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],[AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_ATTRIBUTE_NORETURN)],[AC_MSG_RESULT(no) ++]) + dnl Checks for libraries. + + AC_CHECK_LIB(fl,yywrap, +@@ -315,4 +313,5 @@ + ) + AC_SUBST(DAEMON_GROUPNAME) + +-AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) ++AC_CONFIG_FILES([Makefile atrun atd.8 atrun.8 at.1 batch]) ++AC_OUTPUT diff --git a/at/at-3.1.8/nonrootinstall.patch b/at/at-3.1.8/nonrootinstall.patch index e69de29bb2..8dcf61d36e 100644 --- a/at/at-3.1.8/nonrootinstall.patch +++ b/at/at-3.1.8/nonrootinstall.patch @@ -0,0 +1,80 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- at-3.1.8/Makefile.in~nonrootinstall ++++ at-3.1.8/Makefile.in +@@ -40,6 +40,10 @@ + LIBS = @LIBS@ + LIBOBJS = @LIBOBJS@ + INSTALL = @INSTALL@ ++ifeq ($(IROOT),) ++INSTALLOWN = -g root -o root ++DAEMONOWN = -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) ++endif + + CLONES = atq atrm + ATOBJECTS = at.o panic.o perm.o y.tab.o lex.yy.o +@@ -87,37 +91,41 @@ + $(CC) -c $(CFLAGS) $(DEFS) $*.c + + install: all +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) +- $(INSTALL) -m 755 -d $(IROOT)$(ATJOB_DIR) +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(etcdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(bindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(docdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(atdocdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(ATJOB_DIR) ++ $(INSTALL) $(DAEMONOWN) -m 755 -d $(IROOT)$(ATSPOOL_DIR) + chmod 700 $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR) ++ifeq ($(IROOT),) + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR) ++endif + touch $(IROOT)$(LFILE) + chmod 600 $(IROOT)$(LFILE) ++ifeq ($(IROOT),) + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) +- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -m 600 at.deny $(IROOT)$(etcdir)/ +- $(INSTALL) -g root -o root -m 4755 -s at $(IROOT)$(bindir) ++endif ++ test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) $(INSTALLOWN) -m 600 at.deny $(IROOT)$(etcdir)/ ++ $(INSTALL) $(INSTALLOWN) -m 4755 -s at $(IROOT)$(bindir) + $(LN_S) -f at $(IROOT)$(bindir)/atq + $(LN_S) -f at $(IROOT)$(bindir)/atrm +- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) +- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 755 batch $(IROOT)$(bindir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man1dir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man5dir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man8dir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -s atd $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 atrun $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 644 at.1 $(IROOT)$(man1dir)/ + cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 +- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 644 atd.8 $(IROOT)$(man8dir)/ + sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman +- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 ++ $(INSTALL) $(INSTALLOWN) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 + rm -f tmpman +- $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 644 at_allow.5 $(IROOT)$(man5dir)/ + cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 +- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) ++ $(INSTALL) $(INSTALLOWN) -m 644 $(DOCS) $(IROOT)$(atdocdir) + rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ + $(IROOT)$(mandir)/cat1/atq.1* + rm -f $(IROOT)$(mandir)/cat1/atd.8* diff --git a/atk/atk-1.2.0/m4.patch b/atk/atk-1.2.0/m4.patch index e69de29bb2..8f373364e4 100644 --- a/atk/atk-1.2.0/m4.patch +++ b/atk/atk-1.2.0/m4.patch @@ -0,0 +1,2458 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null ++++ atk-1.2.0/m4/codeset.m4 +@@ -0,0 +1,23 @@ ++# codeset.m4 serial AM1 (gettext-0.10.40) ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++AC_DEFUN([AM_LANGINFO_CODESET], ++[ ++ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, ++ [AC_TRY_LINK([#include <langinfo.h>], ++ [char* cs = nl_langinfo(CODESET);], ++ am_cv_langinfo_codeset=yes, ++ am_cv_langinfo_codeset=no) ++ ]) ++ if test $am_cv_langinfo_codeset = yes; then ++ AC_DEFINE(HAVE_LANGINFO_CODESET, 1, ++ [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/gettext.m4 +@@ -0,0 +1,587 @@ ++# gettext.m4 serial 17 (gettext-0.11.5) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. ++ ++dnl Authors: ++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. ++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002. ++ ++dnl Macro to add for using GNU gettext. ++ ++dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). ++dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The ++dnl default (if it is not specified or empty) is 'no-libtool'. ++dnl INTLSYMBOL should be 'external' for packages with no intl directory, ++dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. ++dnl If INTLSYMBOL is 'use-libtool', then a libtool library ++dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, ++dnl depending on --{enable,disable}-{shared,static} and on the presence of ++dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library ++dnl $(top_builddir)/intl/libintl.a will be created. ++dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext ++dnl implementations (in libc or libintl) without the ngettext() function ++dnl will be ignored. If NEEDSYMBOL is specified and is ++dnl 'need-formatstring-macros', then GNU gettext implementations that don't ++dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. ++dnl INTLDIR is used to find the intl libraries. If empty, ++dnl the value `$(top_builddir)/intl/' is used. ++dnl ++dnl The result of the configuration is one of three cases: ++dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled ++dnl and used. ++dnl Catalog format: GNU --> install in $(datadir) ++dnl Catalog extension: .mo after installation, .gmo in source tree ++dnl 2) GNU gettext has been found in the system's C library. ++dnl Catalog format: GNU --> install in $(datadir) ++dnl Catalog extension: .mo after installation, .gmo in source tree ++dnl 3) No internationalization, always use English msgid. ++dnl Catalog format: none ++dnl Catalog extension: none ++dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. ++dnl The use of .gmo is historical (it was needed to avoid overwriting the ++dnl GNU format catalogs when building on a platform with an X/Open gettext), ++dnl but we keep it in order not to force irrelevant filename changes on the ++dnl maintainers. ++dnl ++AC_DEFUN([AM_GNU_GETTEXT], ++[ ++ dnl Argument checking. ++ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , ++ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ++])])])])]) ++ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , ++ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ++])])])]) ++ define(gt_included_intl, ifelse([$1], [external], [no], [yes])) ++ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) ++ ++ AC_REQUIRE([AM_PO_SUBDIRS])dnl ++ ifelse(gt_included_intl, yes, [ ++ AC_REQUIRE([AM_INTL_SUBDIR])dnl ++ ]) ++ ++ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ ++ dnl Sometimes libintl requires libiconv, so first search for libiconv. ++ dnl Ideally we would do this search only after the ++ dnl if test "$USE_NLS" = "yes"; then ++ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then ++ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT ++ dnl the configure script would need to contain the same shell code ++ dnl again, outside any 'if'. There are two solutions: ++ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. ++ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. ++ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not ++ dnl documented, we avoid it. ++ ifelse(gt_included_intl, yes, , [ ++ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ++ ]) ++ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE(nls, ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT($USE_NLS) ++ AC_SUBST(USE_NLS) ++ ++ ifelse(gt_included_intl, yes, [ ++ BUILD_INCLUDED_LIBINTL=no ++ USE_INCLUDED_LIBINTL=no ++ ]) ++ LIBINTL= ++ LTLIBINTL= ++ POSUB= ++ ++ dnl If we use NLS figure out what method ++ if test "$USE_NLS" = "yes"; then ++ gt_use_preinstalled_gnugettext=no ++ ifelse(gt_included_intl, yes, [ ++ AC_MSG_CHECKING([whether included gettext is requested]) ++ AC_ARG_WITH(included-gettext, ++ [ --with-included-gettext use the GNU gettext library included here], ++ nls_cv_force_use_gnu_gettext=$withval, ++ nls_cv_force_use_gnu_gettext=no) ++ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) ++ ++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ++ ]) ++ dnl User does not insist on using GNU NLS library. Figure out what ++ dnl to use. If GNU gettext is available we use this. Else we have ++ dnl to fall back to GNU NLS library. ++ ++ dnl Add a version number to the cache macros. ++ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) ++ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) ++ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) ++ ++ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, ++ [AC_TRY_LINK([#include <libintl.h> ++]ifelse([$2], [need-formatstring-macros], ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ++#endif ++changequote(,)dnl ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ++changequote([,])dnl ++], [])[extern int _nl_msg_cat_cntr; ++extern int *_nl_domain_bindings;], ++ [bindtextdomain ("", ""); ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], ++ gt_cv_func_gnugettext_libc=yes, ++ gt_cv_func_gnugettext_libc=no)]) ++ ++ if test "$gt_cv_func_gnugettext_libc" != "yes"; then ++ dnl Sometimes libintl requires libiconv, so first search for libiconv. ++ ifelse(gt_included_intl, yes, , [ ++ AM_ICONV_LINK ++ ]) ++ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL ++ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) ++ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL ++ dnl even if libiconv doesn't exist. ++ AC_LIB_LINKFLAGS_BODY([intl]) ++ AC_CACHE_CHECK([for GNU gettext in libintl], ++ gt_cv_func_gnugettext_libintl, ++ [gt_save_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $INCINTL" ++ gt_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBINTL" ++ dnl Now see whether libintl exists and does not depend on libiconv. ++ AC_TRY_LINK([#include <libintl.h> ++]ifelse([$2], [need-formatstring-macros], ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ++#endif ++changequote(,)dnl ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ++changequote([,])dnl ++], [])[extern int _nl_msg_cat_cntr; ++extern ++#ifdef __cplusplus ++"C" ++#endif ++const char *_nl_expand_alias ();], ++ [bindtextdomain ("", ""); ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], ++ gt_cv_func_gnugettext_libintl=yes, ++ gt_cv_func_gnugettext_libintl=no) ++ dnl Now see whether libintl exists and depends on libiconv. ++ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then ++ LIBS="$LIBS $LIBICONV" ++ AC_TRY_LINK([#include <libintl.h> ++]ifelse([$2], [need-formatstring-macros], ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ++#endif ++changequote(,)dnl ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ++changequote([,])dnl ++], [])[extern int _nl_msg_cat_cntr; ++extern ++#ifdef __cplusplus ++"C" ++#endif ++const char *_nl_expand_alias ();], ++ [bindtextdomain ("", ""); ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], ++ [LIBINTL="$LIBINTL $LIBICONV" ++ LTLIBINTL="$LTLIBINTL $LTLIBICONV" ++ gt_cv_func_gnugettext_libintl=yes ++ ]) ++ fi ++ CPPFLAGS="$gt_save_CPPFLAGS" ++ LIBS="$gt_save_LIBS"]) ++ fi ++ ++ dnl If an already present or preinstalled GNU gettext() is found, ++ dnl use it. But if this macro is used in GNU gettext, and GNU ++ dnl gettext is already preinstalled in libintl, we update this ++ dnl libintl. (Cf. the install rule in intl/Makefile.in.) ++ if test "$gt_cv_func_gnugettext_libc" = "yes" \ ++ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ ++ && test "$PACKAGE" != gettext; }; then ++ gt_use_preinstalled_gnugettext=yes ++ else ++ dnl Reset the values set by searching for libintl. ++ LIBINTL= ++ LTLIBINTL= ++ INCINTL= ++ fi ++ ++ ifelse(gt_included_intl, yes, [ ++ if test "$gt_use_preinstalled_gnugettext" != "yes"; then ++ dnl GNU gettext is not found in the C library. ++ dnl Fall back on included GNU gettext library. ++ nls_cv_use_gnu_gettext=yes ++ fi ++ fi ++ ++ if test "$nls_cv_use_gnu_gettext" = "yes"; then ++ dnl Mark actions used to generate GNU NLS library. ++ INTLOBJS="\$(GETTOBJS)" ++ BUILD_INCLUDED_LIBINTL=yes ++ USE_INCLUDED_LIBINTL=yes ++ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" ++ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" ++ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` ++ fi ++ ++ if test "$gt_use_preinstalled_gnugettext" = "yes" \ ++ || test "$nls_cv_use_gnu_gettext" = "yes"; then ++ dnl Mark actions to use GNU gettext tools. ++ CATOBJEXT=.gmo ++ fi ++ ]) ++ ++ if test "$gt_use_preinstalled_gnugettext" = "yes" \ ++ || test "$nls_cv_use_gnu_gettext" = "yes"; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [Define to 1 if translation of program messages to the user's native language ++ is requested.]) ++ else ++ USE_NLS=no ++ fi ++ fi ++ ++ if test "$USE_NLS" = "yes"; then ++ ++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then ++ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then ++ AC_MSG_CHECKING([how to link with libintl]) ++ AC_MSG_RESULT([$LIBINTL]) ++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) ++ fi ++ ++ dnl For backward compatibility. Some packages may be using this. ++ AC_DEFINE(HAVE_GETTEXT, 1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ AC_DEFINE(HAVE_DCGETTEXT, 1, ++ [Define if the GNU dcgettext() function is already present or preinstalled.]) ++ fi ++ ++ dnl We need to process the po/ directory. ++ POSUB=po ++ fi ++ ++ ifelse(gt_included_intl, yes, [ ++ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL ++ dnl to 'yes' because some of the testsuite requires it. ++ if test "$PACKAGE" = gettext; then ++ BUILD_INCLUDED_LIBINTL=yes ++ fi ++ ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(BUILD_INCLUDED_LIBINTL) ++ AC_SUBST(USE_INCLUDED_LIBINTL) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(INTLOBJS) ++ ++ dnl For backward compatibility. Some configure.ins may be using this. ++ nls_cv_header_intl= ++ nls_cv_header_libgt= ++ ++ dnl For backward compatibility. Some Makefiles may be using this. ++ DATADIRNAME=share ++ AC_SUBST(DATADIRNAME) ++ ++ dnl For backward compatibility. Some Makefiles may be using this. ++ INSTOBJEXT=.mo ++ AC_SUBST(INSTOBJEXT) ++ ++ dnl For backward compatibility. Some Makefiles may be using this. ++ GENCAT=gencat ++ AC_SUBST(GENCAT) ++ ++ dnl Enable libtool support if the surrounding package wishes it. ++ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix ++ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ++ ]) ++ ++ dnl For backward compatibility. Some Makefiles may be using this. ++ INTLLIBS="$LIBINTL" ++ AC_SUBST(INTLLIBS) ++ ++ dnl Make all documented variables known to autoconf. ++ AC_SUBST(LIBINTL) ++ AC_SUBST(LTLIBINTL) ++ AC_SUBST(POSUB) ++]) ++ ++ ++dnl Checks for all prerequisites of the po subdirectory, ++dnl except for USE_NLS. ++AC_DEFUN([AM_PO_SUBDIRS], ++[ ++ AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++ AC_REQUIRE([AC_PROG_INSTALL])dnl ++ AC_REQUIRE([AM_MKINSTALLDIRS])dnl ++ ++ dnl Perform the following tests also if --disable-nls has been given, ++ dnl because they are needed for "make dist" to work. ++ ++ dnl Search for GNU msgfmt in the PATH. ++ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. ++ dnl The second test excludes FreeBSD msgfmt. ++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && ++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], ++ :) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ ++ dnl Search for GNU xgettext 0.11 or newer in the PATH. ++ dnl The first test excludes Solaris xgettext and early GNU xgettext versions. ++ dnl The second test excludes FreeBSD xgettext. ++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ++ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], ++ :) ++ dnl Remove leftover from FreeBSD xgettext call. ++ rm -f messages.po ++ ++ dnl Search for GNU msgmerge 0.11 or newer in the PATH. ++ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, ++ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) ++ ++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ++ dnl Test whether we really found GNU msgfmt. ++ if test "$GMSGFMT" != ":"; then ++ dnl If it is no GNU msgfmt we define it as : so that the ++ dnl Makefiles still can work. ++ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && ++ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ++ : ; ++ else ++ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` ++ AC_MSG_RESULT( ++ [found $GMSGFMT program is not GNU msgfmt; ignore it]) ++ GMSGFMT=":" ++ fi ++ fi ++ ++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is no GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ++ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ dnl Remove leftover from FreeBSD xgettext call. ++ rm -f messages.po ++ fi ++ ++ AC_OUTPUT_COMMANDS([ ++ for ac_file in $CONFIG_FILES; do ++ # Support "outfile[:infile[:infile...]]" ++ case "$ac_file" in ++ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; ++ esac ++ # PO directories have a Makefile.in generated from Makefile.in.in. ++ case "$ac_file" in */Makefile.in) ++ # Adjust a relative srcdir. ++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` ++ # In autoconf-2.13 it is called $ac_given_srcdir. ++ # In autoconf-2.50 it is called $srcdir. ++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" ++ case "$ac_given_srcdir" in ++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; ++ /*) top_srcdir="$ac_given_srcdir" ;; ++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;; ++ esac ++ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then ++ rm -f "$ac_dir/POTFILES" ++ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" ++ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" ++ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend ++ # on $ac_dir but don't depend on user-specified configuration ++ # parameters. ++ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then ++ # The LINGUAS file contains the set of available languages. ++ if test -n "$ALL_LINGUAS"; then ++ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" ++ fi ++ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` ++ # Hide the ALL_LINGUAS assigment from automake. ++ eval 'ALL_LINGUAS''=$ALL_LINGUAS_' ++ fi ++ case "$ac_given_srcdir" in ++ .) srcdirpre= ;; ++ *) srcdirpre='$(srcdir)/' ;; ++ esac ++ POFILES= ++ GMOFILES= ++ UPDATEPOFILES= ++ DUMMYPOFILES= ++ for lang in $ALL_LINGUAS; do ++ POFILES="$POFILES $srcdirpre$lang.po" ++ GMOFILES="$GMOFILES $srcdirpre$lang.gmo" ++ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" ++ DUMMYPOFILES="$DUMMYPOFILES $lang.nop" ++ done ++ # CATALOGS depends on both $ac_dir and the user's LINGUAS ++ # environment variable. ++ INST_LINGUAS= ++ if test -n "$ALL_LINGUAS"; then ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "$LINGUAS"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ INST_LINGUAS="$INST_LINGUAS $presentlang" ++ fi ++ done ++ fi ++ CATALOGS= ++ if test -n "$INST_LINGUAS"; then ++ for lang in $INST_LINGUAS; do ++ CATALOGS="$CATALOGS $lang.gmo" ++ done ++ fi ++ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" ++ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" ++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do ++ if test -f "$f"; then ++ case "$f" in ++ *.orig | *.bak | *~) ;; ++ *) cat "$f" >> "$ac_dir/Makefile" ;; ++ esac ++ fi ++ done ++ fi ++ ;; ++ esac ++ done], ++ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute ++ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it ++ # from automake. ++ eval 'ALL_LINGUAS''="$ALL_LINGUAS"' ++ # Capture the value of LINGUAS because we need it to compute CATALOGS. ++ LINGUAS="${LINGUAS-%UNSET%}" ++ ]) ++]) ++ ++ ++dnl Checks for all prerequisites of the intl subdirectory, ++dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, ++dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. ++AC_DEFUN([AM_INTL_SUBDIR], ++[ ++ AC_REQUIRE([AC_PROG_INSTALL])dnl ++ AC_REQUIRE([AM_MKINSTALLDIRS])dnl ++ AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ AC_REQUIRE([AC_PROG_RANLIB])dnl ++ AC_REQUIRE([AC_ISC_POSIX])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ AC_REQUIRE([AC_C_CONST])dnl ++ AC_REQUIRE([AC_C_INLINE])dnl ++ AC_REQUIRE([AC_TYPE_OFF_T])dnl ++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl ++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl ++ AC_REQUIRE([AC_FUNC_MMAP])dnl ++ AC_REQUIRE([jm_GLIBC21])dnl ++ AC_REQUIRE([gt_INTDIV0])dnl ++ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl ++ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl ++ AC_REQUIRE([gt_INTTYPES_PRI])dnl ++ ++ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ ++stdlib.h string.h unistd.h sys/param.h]) ++ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ ++geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ ++strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ++ ++ AM_ICONV ++ AM_LANGINFO_CODESET ++ if test $ac_cv_header_locale_h = yes; then ++ AM_LC_MESSAGES ++ fi ++ ++ dnl intl/plural.c is generated from intl/plural.y. It requires bison, ++ dnl because plural.y uses bison specific features. It requires at least ++ dnl bison-1.26 because earlier versions generate a plural.c that doesn't ++ dnl compile. ++ dnl bison is only needed for the maintainer (who touches plural.y). But in ++ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put ++ dnl the rule in general Makefile. Now, some people carelessly touch the ++ dnl files or have a broken "make" program, hence the plural.c rule will ++ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not ++ dnl present or too old. ++ AC_CHECK_PROGS([INTLBISON], [bison]) ++ if test -z "$INTLBISON"; then ++ ac_verc_fail=yes ++ else ++ dnl Found it, now check the version. ++ AC_MSG_CHECKING([version of bison]) ++changequote(<<,>>)dnl ++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ++ case $ac_prog_version in ++ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; ++ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) ++changequote([,])dnl ++ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ++ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; ++ esac ++ AC_MSG_RESULT([$ac_prog_version]) ++ fi ++ if test $ac_verc_fail = yes; then ++ INTLBISON=: ++ fi ++]) ++ ++ ++AC_DEFUN([AM_MKINSTALLDIRS], ++[ ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but $(top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) ++]) ++ ++ ++dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) ++AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) +--- /dev/null ++++ atk-1.2.0/m4/glib-2.0.m4 +@@ -0,0 +1,212 @@ ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 ++ ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or ++dnl gthread is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN(AM_PATH_GLIB_2_0, ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ esac ++ done ++ ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ ++ no_glib="" ++ ++ if test x$PKG_CONFIG != xno ; then ++ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then ++ : ++ else ++ echo *** pkg-config too old; version 0.7 or better required. ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ else ++ no_glib=yes ++ fi ++ ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi ++ ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi ++ ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest ++]) +--- /dev/null ++++ atk-1.2.0/m4/glibc21.m4 +@@ -0,0 +1,32 @@ ++# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++# Test for the GNU C Library, version 2.1 or newer. ++# From Bruno Haible. ++ ++AC_DEFUN([jm_GLIBC21], ++ [ ++ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, ++ ac_cv_gnu_library_2_1, ++ [AC_EGREP_CPP([Lucky GNU user], ++ [ ++#include <features.h> ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) ++ Lucky GNU user ++ #endif ++#endif ++ ], ++ ac_cv_gnu_library_2_1=yes, ++ ac_cv_gnu_library_2_1=no) ++ ] ++ ) ++ AC_SUBST(GLIBC21) ++ GLIBC21="$ac_cv_gnu_library_2_1" ++ ] ++) +--- /dev/null ++++ atk-1.2.0/m4/glib-gettext.m4 +@@ -0,0 +1,284 @@ ++# Macro to add for using GNU gettext. ++# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 ++# ++# Modified to never use included libintl. ++# Owen Taylor <otaylor@redhat.com>, 12/15/1998 ++# ++# ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. ++# Please note that the actual code is *not* freely available. ++# ++# ++# If you make changes to this file, you MUST update the copy in ++# acinclude.m4. [ aclocal dies on duplicate macros, so if ++# we run 'aclocal -I macros/' then we'll run into problems ++# once we've installed glib-gettext.m4 :-( ] ++# ++ ++AC_DEFUN([AM_GLIB_LC_MESSAGES], ++ [if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your <locale.h> file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) ++else ++ AC_MSG_RESULT(no) ++fi ++AC_SUBST($1)dnl ++]) ++ ++# serial 5 ++ ++AC_DEFUN(AM_GLIB_WITH_NLS, ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) ++ ++ dnl Figure out what method ++ nls_cv_force_use_gnu_gettext="no" ++ ++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ++ dnl User does not insist on using GNU NLS library. Figure out what ++ dnl to use. If gettext or catgets are available (in this order) we ++ dnl use this. Else we have to fall back to GNU NLS library. ++ dnl catgets is only used if permitted by option --with-catgets. ++ nls_cv_header_intl= ++ nls_cv_header_libgt= ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ ++ AC_CHECK_HEADER(libintl.h, ++ [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)]) ++ ++ gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ if test "$gt_cv_func_dgettext_libc" != "yes" ; then ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)]) ++ ++ if test "$gt_cv_func_dgettext_libc" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv) ++ fi ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ LIBS="$LIBS -lintl $libintl_extra_libs"; ++ fi ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ AC_CHECK_FUNCS(dcgettext) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ INSTOBJEXT=.mo ++ fi ++ fi ++ ++ # Added by Martin Baulig 12/15/98 for libc5 systems ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ && test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++ fi ++ ]) ++ ++ if test "$CATOBJEXT" = "NONE"; then ++ dnl Neither gettext nor catgets in included in the C library. ++ dnl Fall back on GNU gettext library. ++ nls_cv_use_gnu_gettext=yes ++ fi ++ fi ++ ++ if test "$nls_cv_use_gnu_gettext" != "yes"; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ else ++ dnl Unset this variable since we use the non-zero value as a flag. ++ CATOBJEXT= ++ fi ++ ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is no GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi ++ ++ # We need to process the po/ directory. ++ POSUB=po ++ ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) ++ ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done ++ ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLDEPS) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(INTLOBJS) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) ++ ++AC_DEFUN(AM_GLIB_GNU_GETTEXT, ++ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++ AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_PROG_RANLIB])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ AC_REQUIRE([AC_C_CONST])dnl ++ AC_REQUIRE([AC_C_INLINE])dnl ++ AC_REQUIRE([AC_TYPE_OFF_T])dnl ++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl ++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl ++ AC_REQUIRE([AC_FUNC_MMAP])dnl ++ ++ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ ++unistd.h sys/param.h]) ++ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ ++strdup __argz_count __argz_stringify __argz_next]) ++ ++ AM_GLIB_LC_MESSAGES ++ AM_GLIB_WITH_NLS ++ ++ if test "x$CATOBJEXT" != "x"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for lang in ${LINGUAS=$ALL_LINGUAS}; do ++ case "$ALL_LINGUAS" in ++ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ++ esac ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi ++ ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi ++ ++ dnl Determine which catalog format we have (if any is needed) ++ dnl For now we know about two different formats: ++ dnl Linux libc-5 and the normal X/Open format ++ test -d po || mkdir po ++ if test "$CATOBJEXT" = ".cat"; then ++ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) ++ ++ dnl Transform the SED scripts while copying because some dumb SEDs ++ dnl cannot handle comments. ++ sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed ++ fi ++ ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) ++ ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) ++ +--- /dev/null ++++ atk-1.2.0/m4/iconv.m4 +@@ -0,0 +1,103 @@ ++# iconv.m4 serial AM4 (gettext-0.11.3) ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], ++[ ++ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ ++ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV ++ dnl accordingly. ++ AC_LIB_LINKFLAGS_BODY([iconv]) ++]) ++ ++AC_DEFUN([AM_ICONV_LINK], ++[ ++ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and ++ dnl those with the standalone portable GNU libiconv installed). ++ ++ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV ++ dnl accordingly. ++ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ++ ++ dnl Add $INCICONV to CPPFLAGS before performing the following checks, ++ dnl because if the user has installed libiconv and not disabled its use ++ dnl via --without-libiconv-prefix, he wants to use it. The first ++ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. ++ am_save_CPPFLAGS="$CPPFLAGS" ++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) ++ ++ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ ++ am_cv_func_iconv="no, consider installing GNU libiconv" ++ am_cv_lib_iconv=no ++ AC_TRY_LINK([#include <stdlib.h> ++#include <iconv.h>], ++ [iconv_t cd = iconv_open("",""); ++ iconv(cd,NULL,NULL,NULL,NULL); ++ iconv_close(cd);], ++ am_cv_func_iconv=yes) ++ if test "$am_cv_func_iconv" != yes; then ++ am_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBICONV" ++ AC_TRY_LINK([#include <stdlib.h> ++#include <iconv.h>], ++ [iconv_t cd = iconv_open("",""); ++ iconv(cd,NULL,NULL,NULL,NULL); ++ iconv_close(cd);], ++ am_cv_lib_iconv=yes ++ am_cv_func_iconv=yes) ++ LIBS="$am_save_LIBS" ++ fi ++ ]) ++ if test "$am_cv_func_iconv" = yes; then ++ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) ++ fi ++ if test "$am_cv_lib_iconv" = yes; then ++ AC_MSG_CHECKING([how to link with libiconv]) ++ AC_MSG_RESULT([$LIBICONV]) ++ else ++ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV ++ dnl either. ++ CPPFLAGS="$am_save_CPPFLAGS" ++ LIBICONV= ++ LTLIBICONV= ++ fi ++ AC_SUBST(LIBICONV) ++ AC_SUBST(LTLIBICONV) ++]) ++ ++AC_DEFUN([AM_ICONV], ++[ ++ AM_ICONV_LINK ++ if test "$am_cv_func_iconv" = yes; then ++ AC_MSG_CHECKING([for iconv declaration]) ++ AC_CACHE_VAL(am_cv_proto_iconv, [ ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <iconv.h> ++extern ++#ifdef __cplusplus ++"C" ++#endif ++#if defined(__STDC__) || defined(__cplusplus) ++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ++#else ++size_t iconv(); ++#endif ++], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") ++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) ++ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ++ AC_MSG_RESULT([$]{ac_t:- ++ }[$]am_cv_proto_iconv) ++ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, ++ [Define as const if the declaration of iconv() needs const.]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/intdiv0.m4 +@@ -0,0 +1,72 @@ ++# intdiv0.m4 serial 1 (gettext-0.11.3) ++dnl Copyright (C) 2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++AC_DEFUN([gt_INTDIV0], ++[ ++ AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], ++ gt_cv_int_divbyzero_sigfpe, ++ [ ++ AC_TRY_RUN([ ++#include <stdlib.h> ++#include <signal.h> ++ ++static void ++#ifdef __cplusplus ++sigfpe_handler (int sig) ++#else ++sigfpe_handler (sig) int sig; ++#endif ++{ ++ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ ++ exit (sig != SIGFPE); ++} ++ ++int x = 1; ++int y = 0; ++int z; ++int nan; ++ ++int main () ++{ ++ signal (SIGFPE, sigfpe_handler); ++/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ ++#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) ++ signal (SIGTRAP, sigfpe_handler); ++#endif ++/* Linux/SPARC yields signal SIGILL. */ ++#if defined (__sparc__) && defined (__linux__) ++ signal (SIGILL, sigfpe_handler); ++#endif ++ ++ z = x / y; ++ nan = y / y; ++ exit (1); ++} ++], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, ++ [ ++ # Guess based on the CPU. ++ case "$host_cpu" in ++ alpha* | i[34567]86 | m68k | s390*) ++ gt_cv_int_divbyzero_sigfpe="guessing yes";; ++ *) ++ gt_cv_int_divbyzero_sigfpe="guessing no";; ++ esac ++ ]) ++ ]) ++ case "$gt_cv_int_divbyzero_sigfpe" in ++ *yes) value=1;; ++ *) value=0;; ++ esac ++ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, ++ [Define if integer division by zero raises signal SIGFPE.]) ++]) +--- /dev/null ++++ atk-1.2.0/m4/inttypes_h.m4 +@@ -0,0 +1,28 @@ ++# inttypes_h.m4 serial 4 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, ++# doesn't clash with <sys/types.h>, and declares uintmax_t. ++ ++AC_DEFUN([jm_AC_HEADER_INTTYPES_H], ++[ ++ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, ++ [AC_TRY_COMPILE( ++ [#include <sys/types.h> ++#include <inttypes.h>], ++ [uintmax_t i = (uintmax_t) -1;], ++ jm_ac_cv_header_inttypes_h=yes, ++ jm_ac_cv_header_inttypes_h=no)]) ++ if test $jm_ac_cv_header_inttypes_h = yes; then ++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, ++[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, ++ and declares uintmax_t. ]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/inttypes.m4 +@@ -0,0 +1,27 @@ ++# inttypes.m4 serial 1 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with ++# <sys/types.h>. ++ ++AC_DEFUN([gt_HEADER_INTTYPES_H], ++[ ++ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, ++ [ ++ AC_TRY_COMPILE( ++ [#include <sys/types.h> ++#include <inttypes.h>], ++ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) ++ ]) ++ if test $gt_cv_header_inttypes_h = yes; then ++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, ++ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/inttypes-pri.m4 +@@ -0,0 +1,32 @@ ++# inttypes-pri.m4 serial 1 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* ++# macros to non-string values. This is the case on AIX 4.3.3. ++ ++AC_DEFUN([gt_INTTYPES_PRI], ++[ ++ AC_REQUIRE([gt_HEADER_INTTYPES_H]) ++ if test $gt_cv_header_inttypes_h = yes; then ++ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], ++ gt_cv_inttypes_pri_broken, ++ [ ++ AC_TRY_COMPILE([#include <inttypes.h> ++#ifdef PRId32 ++char *p = PRId32; ++#endif ++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) ++ ]) ++ fi ++ if test "$gt_cv_inttypes_pri_broken" = yes; then ++ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, ++ [Define if <inttypes.h> exists and defines unusable PRI* macros.]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/isc-posix.m4 +@@ -0,0 +1,26 @@ ++# isc-posix.m4 serial 2 (gettext-0.11.2) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. ++ ++# This test replaces the one in autoconf. ++# Currently this macro should have the same name as the autoconf macro ++# because gettext's gettext.m4 (distributed in the automake package) ++# still uses it. Otherwise, the use in gettext.m4 makes autoheader ++# give these diagnostics: ++# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX ++# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX ++ ++undefine([AC_ISC_POSIX]) ++ ++AC_DEFUN([AC_ISC_POSIX], ++ [ ++ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. ++ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ++ ] ++) +--- /dev/null ++++ atk-1.2.0/m4/lcmessage.m4 +@@ -0,0 +1,32 @@ ++# lcmessage.m4 serial 3 (gettext-0.11.3) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. ++ ++dnl Authors: ++dnl Ulrich Drepper <drepper@cygnus.com>, 1995. ++ ++# Check whether LC_MESSAGES is available in <locale.h>. ++ ++AC_DEFUN([AM_LC_MESSAGES], ++[ ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your <locale.h> file defines LC_MESSAGES.]) ++ fi ++]) +--- /dev/null ++++ atk-1.2.0/m4/lib-ld.m4 +@@ -0,0 +1,97 @@ ++# lib-ld.m4 serial 1 (gettext-0.11) ++dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl Subroutines of libtool.m4, ++dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision ++dnl with libtool.m4. ++ ++dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. ++AC_DEFUN([AC_LIB_PROG_LD_GNU], ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, ++[# I'd rather use --version here, but apparently some GNU ld's only accept -v. ++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then ++ acl_cv_prog_gnu_ld=yes ++else ++ acl_cv_prog_gnu_ld=no ++fi]) ++with_gnu_ld=$acl_cv_prog_gnu_ld ++]) ++ ++dnl From libtool-1.4. Sets the variable LD. ++AC_DEFUN([AC_LIB_PROG_LD], ++[AC_ARG_WITH(gnu-ld, ++[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], ++test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by GCC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]* | [A-Za-z]:[\\/]*)] ++ [re_direlt='/[^/][^/]*/\.\./'] ++ # Canonicalize the path of ld ++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(acl_cv_path_LD, ++[if test -z "$LD"; then ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ acl_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some GNU ld's only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then ++ test "$with_gnu_ld" != no && break ++ else ++ test "$with_gnu_ld" != yes && break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++else ++ acl_cv_path_LD="$LD" # Let the user override the test with a path. ++fi]) ++LD="$acl_cv_path_LD" ++if test -n "$LD"; then ++ AC_MSG_RESULT($LD) ++else ++ AC_MSG_RESULT(no) ++fi ++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) ++AC_LIB_PROG_LD_GNU ++]) +--- /dev/null ++++ atk-1.2.0/m4/lib-link.m4 +@@ -0,0 +1,554 @@ ++# lib-link.m4 serial 3 (gettext-0.11.3) ++dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and ++dnl the libraries corresponding to explicit and implicit dependencies. ++dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and ++dnl augments the CPPFLAGS variable. ++AC_DEFUN([AC_LIB_LINKFLAGS], ++[ ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ define([Name],[translit([$1],[./-], [___])]) ++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ++ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ ++ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ++ ac_cv_lib[]Name[]_libs="$LIB[]NAME" ++ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ++ ac_cv_lib[]Name[]_cppflags="$INC[]NAME" ++ ]) ++ LIB[]NAME="$ac_cv_lib[]Name[]_libs" ++ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" ++ INC[]NAME="$ac_cv_lib[]Name[]_cppflags" ++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) ++ AC_SUBST([LIB]NAME) ++ AC_SUBST([LTLIB]NAME) ++ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the ++ dnl results of this search when this library appears as a dependency. ++ HAVE_LIB[]NAME=yes ++ undefine([Name]) ++ undefine([NAME]) ++]) ++ ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) ++dnl searches for libname and the libraries corresponding to explicit and ++dnl implicit dependencies, together with the specified include files and ++dnl the ability to compile and link the specified testcode. If found, it ++dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and ++dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and ++dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs ++dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. ++AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], ++[ ++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ++ AC_REQUIRE([AC_LIB_RPATH]) ++ define([Name],[translit([$1],[./-], [___])]) |