From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 9 Nov 2004 00:36:47 +0000 Subject: Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches. BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA --- .../aodv/aodv-modules-2.2.2/fix-makefile.patch | 20 + nonworking/apache/apache-2.0.47/configure.patch | 903 ++ nonworking/apache/apache-2.0.47/init | 73 + .../apache/apache-2.0.47/pcre-configure.patch | 36 + .../centericq/centericq-4.9.12/configure.patch | 76 + nonworking/centericq/centericq-4.9.12/m4.patch | 1956 ++++ nonworking/freenote/freenote-1.6.1/compile.patch | 3285 ++++++ .../glib-1.2/glib-1.2-1.2.10/configure.patch | 480 + .../glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h | 6 + nonworking/gnuboy/qtopiagnuboy-1.0.3/gcc3.patch | 71 + .../qtopiagnuboy-1.0.3/qtopiagnuboyl-hwkeys.patch | 63 + nonworking/greader/greader/greader.patch | 96 + .../ltrace/ltrace-0.3.35/no_global_includes.patch | 11 + nonworking/pixdev/pixdev-stable-0.1/braces.patch | 17 + nonworking/ppp/ppp/008_pathnames.h.diff | 11 + nonworking/ppp/ppp/011_scripts_redialer.diff | 152 + nonworking/ppp/ppp/018_ip-up_option.diff | 98 + nonworking/ppp/ppp/057_pppoe-interface-change | 78 + nonworking/ppp/ppp/auth_hook_segfault | 33 + nonworking/ppp/ppp/cifdefroute.dif | 283 + nonworking/ppp/ppp/close_devfd | 17 + nonworking/ppp/ppp/fix_closed_fds | 34 + nonworking/ppp/ppp/install_and_cc.patch | 219 + nonworking/ppp/ppp/makefilenew.patch | 55 + nonworking/ppp/ppp/no_crypt_hack | 45 + nonworking/ppp/ppp/ppp-2.3.11-oedod.dif | 172 + nonworking/ppp/ppp/ppp-2.4.2-stripMSdomain | 35 + nonworking/ppp/ppp/pppdump-no-deflate | 12 + nonworking/ppp/ppp/pppoe_discovery | 150 + nonworking/ppp/ppp/setevn_call_file | 24 + nonworking/ppp/ppp/syslog_local2 | 12 + nonworking/ppp/ppp/use_openssl | 150 + nonworking/pptp-linux/pptp-linux/makefile.patch | 11 + nonworking/pptp-linux/pptp-linux/options.pptp | 30 + .../python/python-gsl-0.2.0/cross-compile.patch | 18 + .../qtopia/qtopia-1.7.0-r0/embeddedkonsole.patch | 10 + nonworking/qtopia/qtopia-1.7.0-r0/ft2.patch | 24 + nonworking/qtopia/qtopia-1.7.0-r0/konsoleEnv.patch | 42 + nonworking/qtopia/qtopia-1.7.0-r0/makefile2.patch | 20 + nonworking/qtopia/qtopia-1.7.0-r0/nofreetype.patch | 12 + .../qtopia/qtopia-1.7.0-r0/performance.patch | 18 + nonworking/qtopia/qtopia-1.7.0-r0/qpe.patch | 12 + .../qtopia-1.7.0-r0/qt-embedded-rotation.control | 11 + .../qtopia/qtopia-1.7.0-r0/qtopia-init.control | 8 + .../qtopia/qtopia-1.7.0-r0/qtopia-init.postinst | 9 + nonworking/qtopia/qtopia-1.7.0-r0/security.patch | 15 + nonworking/qtopia/qtopia-1.7.0-r0/storage.patch | 22 + .../qtopia/qtopia-1.7.0-r0/timezones.control | 11 + .../qtopia/qtopia-1.7.0-r0/unit_conversion.dat | 406 + nonworking/unison/unison-2.9.1/debian.patch | 10982 +++++++++++++++++++ .../dirty-3.2-xterm-breakage-fix.patch | 35 + nonworking/xfree86/xfree86-4.3.0/host.def | 22 + .../xfree86-4.3.0/tinyx-kbd-enable-fix.patch | 37 + .../tinyx-tslib-reset-and-vt-switch-fixes.patch | 69 + 54 files changed, 20497 insertions(+) (limited to 'nonworking') diff --git a/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch b/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch index e69de29bb2..3bee769b3f 100644 --- a/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch +++ b/nonworking/aodv/aodv-modules-2.2.2/fix-makefile.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- kernel-aodv_v2.2.2/Makefile~fix-makefile 2004-05-21 23:56:52.000000000 +0200 ++++ kernel-aodv_v2.2.2/Makefile 2004-07-09 23:20:56.000000000 +0200 +@@ -35,9 +35,9 @@ + MODCFLAGS := -O3 -DMODULE -D__KERNEL__ -DLINUX + endif + ifeq ($(TARGET),arm) +- CC := arm-linux-gcc +- LD := arm-linux-ld -m armelf -r +- KPATH := /home/adhoc/ipaq/include/ ++ #CC := arm-linux-gcc ++ #LD := arm-linux-ld -m armelf -r ++ KPATH := $(KERNEL_PATH)/include/ + MODCFLAGS := -O3 -DMODULE -D__KERNEL__ -DLINUX -DARM + endif + ifeq ($(TARGET),mipsel) diff --git a/nonworking/apache/apache-2.0.47/configure.patch b/nonworking/apache/apache-2.0.47/configure.patch index e69de29bb2..95d43fcd1b 100644 --- a/nonworking/apache/apache-2.0.47/configure.patch +++ b/nonworking/apache/apache-2.0.47/configure.patch @@ -0,0 +1,903 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- httpd-2.0.47/./configure.in~configure 2003-05-21 00:46:00.000000000 -0400 ++++ httpd-2.0.47/./configure.in 2004-01-26 19:43:04.000000000 -0500 +@@ -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 +-#include ], [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 ++#include ]], [[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 +@@ -566,7 +566,9 @@ + dnl Ensure that docs/conf is created. + test -d docs/conf||$mkdir_p docs/conf + +-AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[ ++AC_CONFIG_FILES([$APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk]) ++AC_CONFIG_COMMANDS([default],[[true]],[[ + APACHE_GEN_MAKEFILES +-]) ++]]) ++AC_OUTPUT + +--- httpd-2.0.47/./srclib/apr/configure.in~configure 2003-06-11 11:20:33.000000000 -0400 ++++ httpd-2.0.47/./srclib/apr/configure.in 2004-01-26 19:39:34.000000000 -0500 +@@ -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" + +@@ -510,18 +511,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 +-#include ], +- [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 ++#include ]], [[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 +-#include ], +- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], +- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) ++#include ]], [[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]) +@@ -602,7 +599,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 + #include + #include +@@ -625,7 +622,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 +@@ -829,7 +826,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 +@@ -936,12 +934,11 @@ + # being included by itself. Check for 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 + #endif + #include +-], [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]) +@@ -1012,7 +1009,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 +@@ -1351,7 +1348,7 @@ + fi + + AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[ +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -1361,10 +1358,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) +@@ -1378,7 +1375,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 + #include + #include +@@ -1397,22 +1394,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 + #include + #include +-],[ ++]], [[ + 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) + +@@ -1434,7 +1430,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 + #include + int main() +@@ -1452,7 +1448,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]) + +@@ -1461,15 +1457,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 +-#include ],[ ++#include ]], [[ + 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) +@@ -1637,7 +1633,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 + +@@ -1673,9 +1669,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 +-#include ], [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 ++#include ]], [[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]) +@@ -1684,14 +1679,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 + #include +-],[ ++]], [[ + 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]) + +@@ -1898,12 +1893,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 +@@ -1912,7 +1908,8 @@ + rm -f $i.save + done + chmod +x apr-config +-]) ++]],[[]]) ++AC_OUTPUT + + dnl ----------------------------- Fixup Makefiles for VPATH support + +--- httpd-2.0.47/./srclib/pcre/configure.in~configure 2002-03-20 01:56:34.000000000 -0500 ++++ httpd-2.0.47/./srclib/pcre/configure.in 2004-01-26 19:43:27.000000000 -0500 +@@ -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.47/./srclib/apr-util/xml/expat/configure.in~configure 2001-07-08 22:31:04.000000000 -0400 ++++ httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in 2004-01-26 19:39:34.000000000 -0500 +@@ -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.47/./srclib/apr-util/configure.in~configure 2003-06-12 03:27:10.000000000 -0400 ++++ httpd-2.0.47/./srclib/apr-util/configure.in 2004-01-26 19:39:34.000000000 -0500 +@@ -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) +@@ -29,7 +30,7 @@ + USE_VPATH=1 + fi + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + + dnl + dnl compute the top directory of the build +@@ -191,13 +192,15 @@ + dnl + dnl everthing is done. + MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile" +-AC_OUTPUT([ ++AC_CONFIG_FILES([ + export_vars.sh + apu-config + include/private/apu_select_dbm.h + include/apr_ldap.h + include/apu.h + $MAKEFILES +- ],[ ++ ]) ++AC_CONFIG_COMMANDS([default],[[ + chmod +x apu-config +-]) ++]],[[]]) ++AC_OUTPUT +--- httpd-2.0.47/acinclude.m4~configure 2002-11-29 06:05:57.000000000 -0500 ++++ httpd-2.0.47/acinclude.m4 2004-01-26 19:39:34.000000000 -0500 +@@ -4,25 +4,25 @@ + dnl AC_HELP_STRING, so let's try to call it if we can. + dnl Note: this define must be on one line so that it can be properly returned + dnl as the help string. +-AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl ++AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl + + dnl APACHE_SUBST(VARIABLE) + dnl Makes VARIABLE available in generated files + dnl (do not use @variable@ in Makefiles, but $(variable)) +-AC_DEFUN(APACHE_SUBST,[ ++AC_DEFUN([APACHE_SUBST],[ + APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" + AC_SUBST($1) + ]) + + dnl APACHE_FAST_OUTPUT(FILENAME) + dnl Perform substitutions on FILENAME (Makefiles only) +-AC_DEFUN(APACHE_FAST_OUTPUT,[ ++AC_DEFUN([APACHE_FAST_OUTPUT],[ + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" + ]) + + dnl APACHE_GEN_CONFIG_VARS + dnl Creates config_vars.mk +-AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ ++AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ + APACHE_SUBST(abs_srcdir) + APACHE_SUBST(bindir) + APACHE_SUBST(sbindir) +@@ -104,14 +104,14 @@ + + dnl APACHE_GEN_MAKEFILES + dnl Creates Makefiles +-AC_DEFUN(APACHE_GEN_MAKEFILES,[ ++AC_DEFUN([APACHE_GEN_MAKEFILES],[ + $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES + ]) + + dnl ## APACHE_OUTPUT(file) + dnl ## adds "file" to the list of files generated by AC_OUTPUT + dnl ## This macro can be used several times. +-AC_DEFUN(APACHE_OUTPUT, [ ++AC_DEFUN([APACHE_OUTPUT], [ + APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" + ]) + +@@ -120,7 +120,7 @@ + dnl + dnl If rlim_t is not defined, define it to int + dnl +-AC_DEFUN(APACHE_TYPE_RLIM_T, [ ++AC_DEFUN([APACHE_TYPE_RLIM_T], [ + AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ + AC_TRY_COMPILE([ + #include +@@ -138,7 +138,7 @@ + ]) + + dnl APACHE_MODPATH_INIT(modpath) +-AC_DEFUN(APACHE_MODPATH_INIT,[ ++AC_DEFUN([APACHE_MODPATH_INIT],[ + current_dir=$1 + modpath_current=modules/$1 + modpath_static= +@@ -147,7 +147,7 @@ + > $modpath_current/modules.mk + ])dnl + dnl +-AC_DEFUN(APACHE_MODPATH_FINISH,[ ++AC_DEFUN([APACHE_MODPATH_FINISH],[ + echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk +@@ -160,7 +160,7 @@ + ])dnl + dnl + dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) +-AC_DEFUN(APACHE_MODPATH_ADD,[ ++AC_DEFUN([APACHE_MODPATH_ADD],[ + if test -z "$3"; then + objects="mod_$1.lo" + else +@@ -203,7 +203,7 @@ + dnl setting. otherwise, fall under the "all" setting. + dnl explicit yes/no always overrides. + dnl +-AC_DEFUN(APACHE_MODULE,[ ++AC_DEFUN([APACHE_MODULE],[ + AC_MSG_CHECKING(whether to enable mod_$1) + define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl + AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5)) +@@ -273,7 +273,7 @@ + dnl + dnl APACHE_LAYOUT(configlayout, layoutname) + dnl +-AC_DEFUN(APACHE_LAYOUT,[ ++AC_DEFUN([APACHE_LAYOUT],[ + if test ! -f $srcdir/config.layout; then + echo "** Error: Layout file $srcdir/config.layout not found" + echo "** Error: Cannot use undefined layout '$LAYOUT'" +@@ -325,7 +325,7 @@ + dnl + dnl APACHE_ENABLE_LAYOUT + dnl +-AC_DEFUN(APACHE_ENABLE_LAYOUT,[ ++AC_DEFUN([APACHE_ENABLE_LAYOUT],[ + AC_ARG_ENABLE(layout, + [ --enable-layout=LAYOUT],[ + LAYOUT=$enableval +@@ -343,7 +343,7 @@ + dnl + dnl APACHE_ENABLE_MODULES + dnl +-AC_DEFUN(APACHE_ENABLE_MODULES,[ ++AC_DEFUN([APACHE_ENABLE_MODULES],[ + module_selection=default + module_default=yes + +@@ -372,7 +372,7 @@ + ]) + ]) + +-AC_DEFUN(APACHE_REQUIRE_CXX,[ ++AC_DEFUN([APACHE_REQUIRE_CXX],[ + if test -z "$apache_cxx_done"; then + AC_PROG_CXX + AC_PROG_CXXCPP +@@ -389,7 +389,7 @@ + dnl and then AC_TRY_LINK to test the libraries directly for the version, + dnl but that will require someone who knows how to program openssl. + dnl +-AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ ++AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[ + if test "x$ap_ssltk_base" = "x"; then + AC_MSG_CHECKING(for SSL/TLS toolkit base) + ap_ssltk_base="" +@@ -499,14 +499,14 @@ + dnl apache will use while generating scripts like autoconf and apxs and + dnl the default config file. + +-AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ ++AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ + APR_EXPAND_VAR(exp_$1, [$]$1) + APACHE_SUBST(exp_$1) + APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) + APACHE_SUBST(rel_$1) + ]) + +-AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ ++AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ + APACHE_SUBST_EXPANDED_ARG(exec_prefix) + APACHE_SUBST_EXPANDED_ARG(bindir) + APACHE_SUBST_EXPANDED_ARG(sbindir) +--- httpd-2.0.47/srclib/apr/build/apr_common.m4~configure 2003-04-05 16:42:20.000000000 -0500 ++++ httpd-2.0.47/srclib/apr/build/apr_common.m4 2004-01-26 19:39:34.000000000 -0500 +@@ -6,7 +6,7 @@ + dnl + dnl Saves a snapshot of the configure command-line for later reuse + dnl +-AC_DEFUN(APR_CONFIG_NICE,[ ++AC_DEFUN([APR_CONFIG_NICE],[ + rm -f $1 + cat >$1</dev/null 2>&1 +@@ -93,7 +93,7 @@ + dnl Trying to optimize this is left as an exercise to the reader who wants + dnl to put up with more autoconf craziness. I give up. + dnl +-AC_DEFUN(APR_SUBDIR_CONFIG, [ ++AC_DEFUN([APR_SUBDIR_CONFIG], [ + # save our work to this point; this allows the sub-package to use it + AC_CACHE_SAVE + +@@ -158,7 +158,7 @@ + dnl + dnl Stores the variable (usually a Makefile macro) for later restoration + dnl +-AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[ ++AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[ + apr_ste_save_$1="$$1" + ])dnl + +@@ -170,7 +170,7 @@ + dnl and restoring the original variable contents. This makes it possible + dnl for a user to override configure when it does something stupid. + dnl +-AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[ ++AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[ + if test "x$apr_ste_save_$1" = "x"; then + $2$1="$$1" + $1= +@@ -192,7 +192,7 @@ + dnl + dnl Set variable iff it's currently null + dnl +-AC_DEFUN(APR_SETIFNULL,[ ++AC_DEFUN([APR_SETIFNULL],[ + if test -z "$$1"; then + echo " setting $1 to \"$2\"" + $1="$2" +@@ -204,7 +204,7 @@ + dnl + dnl Set variable no matter what + dnl +-AC_DEFUN(APR_SETVAR,[ ++AC_DEFUN([APR_SETVAR],[ + echo " forcing $1 to \"$2\"" + $1="$2" + ])dnl +@@ -214,7 +214,7 @@ + dnl + dnl Add value to variable + dnl +-AC_DEFUN(APR_ADDTO,[ ++AC_DEFUN([APR_ADDTO],[ + if test "x$$1" = "x"; then + echo " setting $1 to \"$2\"" + $1="$2" +@@ -241,7 +241,7 @@ + dnl + dnl Remove a value from a variable + dnl +-AC_DEFUN(APR_REMOVEFROM,[ ++AC_DEFUN([APR_REMOVEFROM],[ + if test "x$$1" = "x$2"; then + echo " nulling $1" + $1="" +@@ -265,7 +265,7 @@ + dnl + dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] ) + dnl +-AC_DEFUN(APR_CHECK_DEFINE_FILES,[ ++AC_DEFUN([APR_CHECK_DEFINE_FILES],[ + AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ + ac_cv_define_$1=no + for curhdr in $2 +@@ -287,7 +287,7 @@ + dnl + dnl APR_CHECK_DEFINE(symbol, header_file) + dnl +-AC_DEFUN(APR_CHECK_DEFINE,[ ++AC_DEFUN([APR_CHECK_DEFINE],[ + AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ + AC_EGREP_CPP(YES_IS_DEFINED, [ + #include <$2> +@@ -304,7 +304,7 @@ + dnl + dnl APR_CHECK_APR_DEFINE( symbol ) + dnl +-AC_DEFUN(APR_CHECK_APR_DEFINE,[ ++AC_DEFUN([APR_CHECK_APR_DEFINE],[ + apr_old_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $INCLUDES" + AC_EGREP_CPP(YES_IS_DEFINED, [ +@@ -329,7 +329,7 @@ + fi]) + ]) + +-define(APR_IFALLYES,[dnl ++define([APR_IFALLYES],[dnl + ac_rc=yes + for ac_spec in $1; do + ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` +@@ -364,14 +364,14 @@ + ]) + + +-define(APR_BEGIN_DECISION,[dnl ++define([APR_BEGIN_DECISION],[dnl + ac_decision_item='$1' + ac_decision_msg='FAILED' + ac_decision='' + ]) + + +-define(APR_DECIDE,[dnl ++define([APR_DECIDE],[dnl + ac_decision='$1' + ac_decision_msg='$2' + ac_decision_$1=yes +@@ -379,7 +379,7 @@ + ]) + + +-define(APR_DECISION_OVERRIDE,[dnl ++define([APR_DECISION_OVERRIDE],[dnl + ac_decision='' + for ac_item in $1; do + eval "ac_decision_this=\$ac_decision_${ac_item}" +@@ -391,13 +391,13 @@ + ]) + + +-define(APR_DECISION_FORCE,[dnl ++define([APR_DECISION_FORCE],[dnl + ac_decision="$1" + eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" + ]) + + +-define(APR_END_DECISION,[dnl ++define([APR_END_DECISION],[dnl + if test ".$ac_decision" = .; then + echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2 + exit 1 +@@ -417,7 +417,7 @@ + dnl A variant of AC_CHECK_SIZEOF which allows the checking of + dnl sizes of non-builtin types + dnl +-AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED, ++AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED], + [changequote(<<,>>)dnl + dnl The name to #define + define(<>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl +@@ -450,7 +450,7 @@ + dnl Tries a compile test with warnings activated so that the result + dnl is false if the code doesn't compile cleanly. + dnl +-AC_DEFUN(APR_TRY_COMPILE_NO_WARNING, ++AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + [if test "x$CFLAGS_WARN" = "x"; then + apr_tcnw_flags="" + else +@@ -489,7 +489,7 @@ + dnl string. + dnl + dnl +-AC_DEFUN(APR_CHECK_STRERROR_R_RC,[ ++AC_DEFUN([APR_CHECK_STRERROR_R_RC],[ + AC_MSG_CHECKING(for type of return code from strerror_r) + AC_TRY_RUN([ + #include +@@ -522,7 +522,7 @@ + dnl Decide which of a couple of flavors of crypt_r() is necessary for + dnl this platform. + dnl +-AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[ ++AC_DEFUN([APR_CHECK_CRYPT_R_STYLE],[ + AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[ + dnl + ac_cv_crypt_r_style=none +@@ -576,7 +576,7 @@ + dnl structure on this platform. Single UNIX Spec says d_ino, + dnl BSD uses d_fileno. Undef to find the real beast. + dnl +-AC_DEFUN(APR_CHECK_DIRENT_INODE, [ ++AC_DEFUN([APR_CHECK_DIRENT_INODE], [ + AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [ + apr_cv_dirent_inode=no + AC_TRY_COMPILE([ +@@ -613,7 +613,7 @@ + dnl Note that this is worthless without DT_xxx macros, so + dnl look for one while we are at it. + dnl +-AC_DEFUN(APR_CHECK_DIRENT_TYPE,[ ++AC_DEFUN([APR_CHECK_DIRENT_TYPE],[ + AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[ + apr_cv_dirent_type=no + AC_TRY_COMPILE([ +@@ -645,8 +645,8 @@ + dnl within each iteration. + dnl + changequote({,}) +-define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) +-define({APR_FOREACH}, ++define([{APR_COMMA_ARGS}],{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) ++define([{APR_FOREACH}], + {ifelse($}{2,,, + [define([eachval], + $}{2)$}{1[]APR_FOREACH([$}{1], +@@ -661,7 +661,7 @@ + dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of + dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no. + dnl +-AC_DEFUN(APR_FLAG_HEADERS,[ ++AC_DEFUN([APR_FLAG_HEADERS],[ + AC_CHECK_HEADERS($1) + for aprt_i in $1 + do +@@ -682,7 +682,7 @@ + dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET + dnl to yes or no. + dnl +-AC_DEFUN(APR_FLAG_FUNCS,[ ++AC_DEFUN([APR_FLAG_FUNCS],[ + AC_CHECK_FUNCS($1) + for aprt_j in $1 + do +@@ -707,7 +707,7 @@ + dnl APR_EXPAND_VAR(fraz, $baz) + dnl $fraz is now "1/2/3" + dnl +-AC_DEFUN(APR_EXPAND_VAR,[ ++AC_DEFUN([APR_EXPAND_VAR],[ + ap_last= + ap_cur="$2" + while test "x${ap_cur}" != "x${ap_last}"; +@@ -726,7 +726,7 @@ + dnl orig_path="${prefix}/bar" + dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix) + dnl $final_path now contains "bar" +-AC_DEFUN(APR_PATH_RELATIVE,[ ++AC_DEFUN([APR_PATH_RELATIVE],[ + ap_stripped=`echo $2 | sed -e "s#^$3##"` + # check if the stripping was successful + if test "x$2" != "x${ap_stripped}"; then +@@ -744,12 +744,12 @@ + dnl Note: this define must be on one line so that it can be properly returned + dnl as the help string. When using this macro with a multi-line RHS, ensure + dnl that you surround the macro invocation with []s +-AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) ++AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) + + dnl + dnl APR_LAYOUT(configlayout, layoutname [, extravars]) + dnl +-AC_DEFUN(APR_LAYOUT,[ ++AC_DEFUN([APR_LAYOUT],[ + if test ! -f $srcdir/config.layout; then + echo "** Error: Layout file $srcdir/config.layout not found" + echo "** Error: Cannot use undefined layout '$LAYOUT'" +@@ -805,7 +805,7 @@ + dnl + dnl APR_ENABLE_LAYOUT(default layout name [, extra vars]) + dnl +-AC_DEFUN(APR_ENABLE_LAYOUT,[ ++AC_DEFUN([APR_ENABLE_LAYOUT],[ + AC_ARG_ENABLE(layout, + [ --enable-layout=LAYOUT],[ + LAYOUT=$enableval +@@ -826,7 +826,7 @@ + dnl a reimplementation of autoconf's argument parser, + dnl used here to allow us to co-exist layouts and argument based + dnl set ups. +-AC_DEFUN(APR_PARSE_ARGUMENTS,[ ++AC_DEFUN([APR_PARSE_ARGUMENTS],[ + ac_prev= + for ac_option + do +@@ -948,7 +948,7 @@ + dnl + dnl Determine what program we can use to generate .deps-style dependencies + dnl +-AC_DEFUN(APR_CHECK_DEPEND,[ ++AC_DEFUN([APR_CHECK_DEPEND],[ + dnl Try to determine what depend program we can use + dnl All GCC-variants should have -MM. + dnl If not, then we can check on those, too. +--- httpd-2.0.47/srclib/apr/build/find_apr.m4~configure 2002-11-05 17:09:19.000000000 -0500 ++++ httpd-2.0.47/srclib/apr/build/find_apr.m4 2004-01-26 19:39:34.000000000 -0500 +@@ -37,7 +37,7 @@ + dnl value of apr_config to fetch any necessary build/link information. + dnl + +-AC_DEFUN(APR_FIND_APR, [ ++AC_DEFUN([APR_FIND_APR], [ + apr_found="no" + + if test "$ac_cv_emxos2" = "yes"; then +--- httpd-2.0.47/srclib/apr-util/build/find_apu.m4~configure 2002-11-05 17:13:42.000000000 -0500 ++++ httpd-2.0.47/srclib/apr-util/build/find_apu.m4 2004-01-26 19:39:34.000000000 -0500 +@@ -41,7 +41,7 @@ + dnl value of apu_config to fetch any necessary build/link information. + dnl + +-AC_DEFUN(APR_FIND_APU, [ ++AC_DEFUN([APR_FIND_APU], [ + apu_found="no" + + AC_MSG_CHECKING(for APR-util) diff --git a/nonworking/apache/apache-2.0.47/init b/nonworking/apache/apache-2.0.47/init index e69de29bb2..7a05c38a9a 100644 --- a/nonworking/apache/apache-2.0.47/init +++ b/nonworking/apache/apache-2.0.47/init @@ -0,0 +1,73 @@ +#!/bin/sh +# +# apache Start the apache HTTP server. +# + +NAME=apache +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/usr/sbin/httpd +SUEXEC=/usr/lib/apache/suexec +PIDFILE=/var/run/$NAME.pid +CONF=/etc/apache/httpd.conf +APACHECTL=/usr/sbin/apachectl + +trap "" 1 +export LANG=C +export PATH + +test -f $DAEMON || exit 0 +test -f $APACHECTL || exit 0 + +# ensure we don't leak environment vars into apachectl +APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" + +if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF +then + exit 0 +fi + +case "$1" in + start) + echo -n "Starting web server: $NAME" + start-stop-daemon -S -x $DAEMON + ;; + + stop) + echo -n "Stopping web server: $NAME" + start-stop-daemon -K -x $DAEMON + ;; + + reload) + echo -n "Reloading $NAME configuration" + start-stop-daemon -K --signal USR1 -x $DAEMON + ;; + + reload-modules) + echo -n "Reloading $NAME modules" + start-stop-daemon -K + start-stop-daemon -S -x $DAEMON + ;; + + restart) + $0 reload-modules + exit $? + ;; + + force-reload) + $0 reload-modules + exit $? + ;; + + *) + echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" + exit 1 + ;; +esac + +if [ $? == 0 ]; then + echo . + exit 0 +else + echo failed + exit 1 +fi diff --git a/nonworking/apache/apache-2.0.47/pcre-configure.patch b/nonworking/apache/apache-2.0.47/pcre-configure.patch index e69de29bb2..0460d17456 100644 --- a/nonworking/apache/apache-2.0.47/pcre-configure.patch +++ b/nonworking/apache/apache-2.0.47/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/nonworking/centericq/centericq-4.9.12/configure.patch b/nonworking/centericq/centericq-4.9.12/configure.patch index e69de29bb2..ac646b4f3e 100644 --- a/nonworking/centericq/centericq-4.9.12/configure.patch +++ b/nonworking/centericq/centericq-4.9.12/configure.patch @@ -0,0 +1,76 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- centericq-4.9.12/./configure.in~configure.patch ++++ centericq-4.9.12/./configure.in +@@ -84,13 +84,6 @@ + else + AC_MSG_RESULT([not found or disabled]) + with_ssl="no" +- +- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ +- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" +- AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls]) +- with_ssl="yes" +- ]) + fi + fi + +--- centericq-4.9.12/./connwrap-0.1/configure.in~configure.patch ++++ centericq-4.9.12/./connwrap-0.1/configure.in +@@ -45,29 +45,29 @@ + else + AC_MSG_RESULT([not found or disabled]) + +- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ +- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" +- AC_DEFINE(HAVE_GNUTLS) +- ]) ++# AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ ++# CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" ++# LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" ++# AC_DEFINE(HAVE_GNUTLS) ++# ]) + fi + fi + + AC_MSG_CHECKING(for inet_aton() presence) + +-AC_TRY_LINK([ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + + #include + #include + #include + #include + +-], [ ++]], [[ + + struct in_addr inp; + inet_aton("address", &inp); + +-], have_aton=yes, have_aton=no) ++]])],[have_aton=yes],[have_aton=no]) + + if test "$have_aton" = "yes"; then + AC_DEFINE(HAVE_INET_ATON) +--- centericq-4.9.12/libgadu-0.1/configure.in~configure.patch ++++ centericq-4.9.12/libgadu-0.1/configure.in +@@ -48,12 +48,6 @@ + AC_CHECK_LIB(ssl, main) + else + AC_MSG_RESULT([not found or disabled]) +- +- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [ +- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra" +- AC_DEFINE(HAVE_GNUTLS) +- ]) + fi + fi + diff --git a/nonworking/centericq/centericq-4.9.12/m4.patch b/nonworking/centericq/centericq-4.9.12/m4.patch index e69de29bb2..60276a0ba6 100644 --- a/nonworking/centericq/centericq-4.9.12/m4.patch +++ b/nonworking/centericq/centericq-4.9.12/m4.patch @@ -0,0 +1,1956 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null ++++ centericq-4.9.7/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 ], ++ [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 and nl_langinfo(CODESET).]) ++ fi ++]) +--- /dev/null ++++ centericq-4.9.7/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 , 1995-2000. ++dnl Bruno Haible , 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 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 ++]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 ++]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 ++]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