pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/corewars
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jun 25 07:52:16 UTC 2026
Modified Files:
pkgsrc/games/corewars: Makefile distinfo
Added Files:
pkgsrc/games/corewars/patches: patch-aclocal_m4 patch-configure_ac
patch-doc-corewars_6 patch-src_dirbrowser_c patch-src_main-cmd_c
patch-src_main-gui_c patch-src_parser-cw_y patch-src_parser-rc_y
Log Message:
corewars: switch to gtk2, stop using argp.
Patches from OpenBSD ports (which got the GTK2 patch from Debian)
- thanks to both projects!
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/corewars/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/corewars/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/corewars/patches/patch-aclocal_m4 \
pkgsrc/games/corewars/patches/patch-configure_ac \
pkgsrc/games/corewars/patches/patch-doc-corewars_6 \
pkgsrc/games/corewars/patches/patch-src_dirbrowser_c \
pkgsrc/games/corewars/patches/patch-src_main-cmd_c \
pkgsrc/games/corewars/patches/patch-src_main-gui_c \
pkgsrc/games/corewars/patches/patch-src_parser-cw_y \
pkgsrc/games/corewars/patches/patch-src_parser-rc_y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/corewars/Makefile
diff -u pkgsrc/games/corewars/Makefile:1.24 pkgsrc/games/corewars/Makefile:1.25
--- pkgsrc/games/corewars/Makefile:1.24 Tue Jun 23 09:52:56 2026
+++ pkgsrc/games/corewars/Makefile Thu Jun 25 07:52:15 2026
@@ -1,23 +1,29 @@
-# $NetBSD: Makefile,v 1.24 2026/06/23 09:52:56 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2026/06/25 07:52:15 wiz Exp $
DISTNAME= corewars-0.9.13
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corewars/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://sourceforge.net/projects/corewars/
#HOMEPAGE= http://sal.math.ualberta.ca/
COMMENT= Programs on a virtual machine, fighting each other
+LICENSE= gnu-gpl-v2
-USE_TOOLS+= gmake
+USE_TOOLS+= autoconf automake autoreconf bison flex gmake pkg-config
GNU_CONFIGURE= yes
-.include "../../mk/bsd.prefs.mk"
+CFLAGS+= -Wno-implicit-function-declaration
-.if ${OPSYS} != "Linux"
-MAKE_FLAGS+= corewars_cmd_LDFLAGS=-largp
-.endif
+# random build failures with -j12
+MAKE_JOBS_SAFE= no
-.include "../../devel/argp/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+# problem with 'bool'
+FORCE_C_STD= c99
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fiv
+
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/corewars/distinfo
diff -u pkgsrc/games/corewars/distinfo:1.8 pkgsrc/games/corewars/distinfo:1.9
--- pkgsrc/games/corewars/distinfo:1.8 Sat Dec 24 14:24:34 2022
+++ pkgsrc/games/corewars/distinfo Thu Jun 25 07:52:15 2026
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.8 2022/12/24 14:24:34 wiz Exp $
+$NetBSD: distinfo,v 1.9 2026/06/25 07:52:15 wiz Exp $
BLAKE2s (corewars-0.9.13.tar.gz) = 424ed84d33a26c31f44831556c8fa6688581b550502abeb607e427fd0c0e15ef
SHA512 (corewars-0.9.13.tar.gz) = fe4194ac5efa7612a06d80c1218740de17a6dae6228f5e603074ab296f4a195adc68c0d8db5bbc9588947a536a9cfc208b411b024163adfe1cda072d05dd6a71
Size (corewars-0.9.13.tar.gz) = 203874 bytes
+SHA1 (patch-aclocal_m4) = 9b5a6f055538c02741719b1f337a6bec203b4bc9
+SHA1 (patch-configure_ac) = ffc95a38174788f7ad6d4af4cf0ae2e7b5dcc336
+SHA1 (patch-doc-corewars_6) = 9928c6ce2561648f1dc1b419e11c835b6ff63c70
+SHA1 (patch-src_dirbrowser_c) = 6fe50113b1730d29e7ecab868490740a2876ee77
SHA1 (patch-src_execute-cw.c) = 4c4a76cd4bed4b2bfb7e93a44c9df91f880c90e3
+SHA1 (patch-src_main-cmd_c) = 2d5c3568671f1d98c8670b9100d84b07656ad5a6
+SHA1 (patch-src_main-gui_c) = 093e442b8a5440bfd4fb70300cac41c986f16a0d
+SHA1 (patch-src_parser-cw_y) = 39f4251e5a9a8f946a2662c474cae07c446d4828
+SHA1 (patch-src_parser-rc_y) = a08c50e2a08e87eafe1fc4f2303bd8741181a3cf
Added files:
Index: pkgsrc/games/corewars/patches/patch-aclocal_m4
diff -u /dev/null pkgsrc/games/corewars/patches/patch-aclocal_m4:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-aclocal_m4 Thu Jun 25 07:52:15 2026
@@ -0,0 +1,1879 @@
+$NetBSD: patch-aclocal_m4,v 1.1 2026/06/25 07:52:15 wiz Exp $
+
+Switch to gtk+2.
+From Debian's corewars_0.9.13+ds-1.diff.
+
+--- aclocal.m4.orig Wed Oct 23 14:52:20 2002
++++ aclocal.m4 Wed Mar 24 23:14:23 2010
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.7.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -12,62 +12,79 @@
+ # PARTICULAR PURPOSE.
+
+ # Configure paths for GLIB
+-# Owen Taylor 97-11-3
++# Owen Taylor 1997-2001
+
+-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
+-dnl gthread is specified in MODULES, pass to glib-config
++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,
++dnl gthread, or gio is specified in MODULES, pass to pkg-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB_2_0],
+ [dnl
+-dnl Get the cflags and libraries from the glib-config script
++dnl Get the cflags and libraries from pkg-config
+ dnl
+-AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
+- glib_config_prefix="$withval", glib_config_prefix="")
+-AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
+- glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+-AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
+ , enable_glibtest=yes)
+
+- if test x$glib_config_exec_prefix != x ; then
+- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+- if test x${GLIB_CONFIG+set} != xset ; then
+- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+- fi
+- fi
+- if test x$glib_config_prefix != x ; then
+- glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+- if test x${GLIB_CONFIG+set} != xset ; then
+- GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+- fi
+- fi
+-
++ pkg_config_args=glib-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gmodule)
+- glib_config_args="$glib_config_args gmodule"
++ pkg_config_args="$pkg_config_args gmodule-2.0"
+ ;;
++ gmodule-no-export)
++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
++ ;;
++ gobject)
++ pkg_config_args="$pkg_config_args gobject-2.0"
++ ;;
+ gthread)
+- glib_config_args="$glib_config_args gthread"
++ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
++ gio*)
++ pkg_config_args="$pkg_config_args $module-2.0"
++ ;;
+ esac
+ done
+
+- AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+- min_glib_version=ifelse([$1], ,0.99.7,$1)
+- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
++ PKG_PROG_PKG_CONFIG([0.16])
++
+ no_glib=""
+- if test "$GLIB_CONFIG" = "no" ; then
++
++ if test "x$PKG_CONFIG" = x ; then
+ no_glib=yes
+- else
+- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
++ PKG_CONFIG=no
++ 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=`$GLIB_CONFIG $glib_config_args --version | \
++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
++ 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"
+@@ -76,7 +93,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do
+ LIBS="$GLIB_LIBS $LIBS"
+ dnl
+ dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+-dnl checks the results of glib-config to some extent
++dnl checks the results of pkg-config to some extent)
+ dnl
+ rm -f conf.glibtest
+ AC_TRY_RUN([
+@@ -103,17 +120,16 @@ main ()
+ (glib_minor_version != $glib_config_minor_version) ||
+ (glib_micro_version != $glib_config_micro_version))
+ {
+- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
++ 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 glib-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 ("*** 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 glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\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) ||
+@@ -141,10 +157,10 @@ main ()
+ 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 glib-config shell script is\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 GLIB_CONFIG environment to point to the\n");
+- printf("*** correct copy of glib-config. (In this case, you will have to\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");
+ }
+@@ -157,20 +173,20 @@ main ()
+ fi
+ fi
+ if test "x$no_glib" = x ; then
+- AC_MSG_RESULT(yes)
++ 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 "$GLIB_CONFIG" = "no" ; then
+- echo "*** The glib-config script installed by GLIB could not be found"
+- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+- echo "*** full path to glib-config."
++ 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([
+@@ -185,82 +201,93 @@ main ()
+ 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 "***"
+- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+- echo "*** came with the system with the command"
+- echo "***"
+- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
++ 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 was incorrectly installed"
+- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
+- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
++ 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
+ ])
+
+ # Configure paths for GTK+
+-# Owen Taylor 97-11-3
++# Owen Taylor 1997-2001
+
+-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
++dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
++dnl pass to pkg-config
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK_2_0],
+ [dnl
+-dnl Get the cflags and libraries from the gtk-config script
++dnl Get the cflags and libraries from pkg-config
+ dnl
+-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
+- gtk_config_prefix="$withval", gtk_config_prefix="")
+-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
++AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
+ , enable_gtktest=yes)
+
++ pkg_config_args=gtk+-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gthread)
+- gtk_config_args="$gtk_config_args gthread"
++ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+ esac
+ done
+
+- if test x$gtk_config_exec_prefix != x ; then
+- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+- if test x${GTK_CONFIG+set} != xset ; then
+- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+- fi
++ no_gtk=""
++
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++ 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_gtk=yes
++ PKG_CONFIG=no
++ fi
++ else
++ no_gtk=yes
+ fi
+- if test x$gtk_config_prefix != x ; then
+- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+- if test x${GTK_CONFIG+set} != xset ; then
+- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+- fi
++
++ min_gtk_version=ifelse([$1], ,2.0.0,$1)
++ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_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 GTK+ found in PKG_CONFIG_PATH"
++ enable_gtktest=no
++ fi
++
++ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++ :
++ else
++ no_gtk=yes
++ fi
+ fi
+
+- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+- min_gtk_version=ifelse([$1], ,0.99.7,$1)
+- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+- no_gtk=""
+- if test "$GTK_CONFIG" = "no" ; then
+- no_gtk=yes
+- else
+- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++ if test x"$no_gtk" = x ; then
++ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+@@ -268,8 +295,8 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do n
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+ dnl
+-dnl Now check if the installed GTK is sufficiently new. (Also sanity
+-dnl checks the results of gtk-config to some extent
++dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent)
+ dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+@@ -296,19 +323,17 @@ main ()
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
++ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+- printf ("*** was found! If gtk-config was correct, then it is best\n");
++ printf ("*** was found! If pkg-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. 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 gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++ printf("*** to point to the correct configuration files\n");
+ }
+-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+@@ -318,7 +343,6 @@ main ()
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+-#endif /* defined (GTK_MAJOR_VERSION) ... */
+ else
+ {
+ if ((gtk_major_version > major) ||
+@@ -336,10 +360,10 @@ main ()
+ printf("*** GTK+ 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 gtk-config shell script is\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 GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++ printf("*** of GTK+, 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");
+ }
+@@ -352,20 +376,20 @@ main ()
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+- AC_MSG_RESULT(yes)
++ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+- if test "$GTK_CONFIG" = "no" ; then
+- echo "*** The gtk-config script installed by GTK could not be found"
+- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the GTK_CONFIG environment variable to the"
+- echo "*** full path to gtk-config."
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** A new enough version of pkg-config was not found."
++ echo "*** See http://pkgconfig.sourceforge.net";
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+- echo "*** Could not run GTK test program, checking why..."
++ echo "*** Could not run GTK+ test program, checking why..."
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
+@@ -373,23 +397,16 @@ main ()
+ #include <stdio.h>
+ ], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding GTK or finding the wrong"
+- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
++ echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++ echo "*** version of GTK+. If it is not finding GTK+, 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 "***"
+- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+- echo "*** came with the system with the command"
+- echo "***"
+- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
++ 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 GTK was incorrectly installed"
+- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+@@ -403,330 +420,191 @@ main ()
+ rm -f conf.gtktest
+ ])
+
+-# Do all the work for Automake. -*- Autoconf -*-
+-
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
+-
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
++#
+ # 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.
+-
++# the Free Software Foundation; either version 2 of the License, 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.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
+-# serial 8
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
+
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
+
+
+-AC_PREREQ([2.54])
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
+
+-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+-# the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
+
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+- AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-fi
+
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
+
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_MISSING_PROG(AMTAR, tar)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-])
+-])
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
++$$1_PKG_ERRORS
+
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-# Copyright 2002 Free Software Foundation, Inc.
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-# 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.
++_PKG_TEXT
+
+-# 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.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+
+-# 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
++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.7.1])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+-# Helper functions for option handling. -*- Autoconf -*-
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# Copyright 2001, 2002 Free Software Foundation, Inc.
+-
+-# 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.
+-
+-# serial 2
+-
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+-
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+-
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+-
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
+-# Check to make sure that the build environment is sane.
+-#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+-
+-# 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.
+-
+-# serial 3
+-
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+-
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
+-
+-# -*- Autoconf -*-
+-
+-
+-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+-
+-# 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.
+-
+-# serial 3
+-
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
+-
+-
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
+-fi
+-])
+-
+-# AM_AUX_DIR_EXPAND
+-
+-# Copyright 2001 Free Software Foundation, Inc.
+-
+-# 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.
+-
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+@@ -765,99 +643,56 @@ fi
+ # absolute PATH. The drawback is that using absolute paths prevent a
+ # configured tree to be moved without reconfiguration.
+
+-# Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])
+-
+-AC_DEFUN([AM_AUX_DIR_EXPAND], [
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
++# AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright 2001 Free Software Foundation, Inc.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++# serial 7
+
+-# 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.
+-
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
+-
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright 2001 Free Software Foundation, Inc.
+-
+-# 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.
+-
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
+
+-# serial 4 -*- Autoconf -*-
+
+-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++# serial 8
+
+-# 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.
+-
+-
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+@@ -865,7 +700,6 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -901,18 +735,34 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+- echo '#include "conftest.h"' > conftest.c
+- echo 'int i;' > conftest.h
+- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+@@ -930,13 +780,25 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=conftest.c object=conftest.o \
+- depfile=conftest.Po tmpdepfile=conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+- grep conftest.h conftest.Po > /dev/null 2>&1 &&
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- am_cv_$1_dependencies_compiler_type=$depmode
+- break
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_$1_dependencies_compiler_type=$depmode
++ break
++ fi
+ fi
+ done
+
+@@ -958,16 +820,8 @@ AM_CONDITIONAL([am__fastdep$1], [
+ # Choose a directory name for dependency files.
+ # This macro is AC_REQUIREd in _AM_DEPENDENCIES
+ AC_DEFUN([AM_SET_DEPDIR],
+-[rm -f .deps 2>/dev/null
+-mkdir .deps 2>/dev/null
+-if test -d .deps; then
+- DEPDIR=.deps
+-else
+- # MS-DOS does not allow filenames that begin with a dot.
+- DEPDIR=_deps
+-fi
+-rmdir .deps 2>/dev/null
+-AC_SUBST([DEPDIR])
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+ ])
+
+
+@@ -975,8 +829,8 @@ AC_SUBST([DEPDIR])
+ # ------------
+ AC_DEFUN([AM_DEP_TRACK],
+ [AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking Speeds up one-time builds
+- --enable-dependency-tracking Do not reject slow dependency extractors])
++[ --disable-dependency-tracking speeds up one-time build
++ --enable-dependency-tracking do not reject slow dependency extractors])
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+@@ -985,27 +839,17 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tra
+ AC_SUBST([AMDEPBACKSLASH])
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++#serial 3
+
+-# 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.
+-
+-#serial 2
+-
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+@@ -1023,27 +867,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+ else
+ continue
+ fi
+- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+- # Extract the definition of DEP_FILES from the Makefile without
+- # running `make'.
+- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n -e '/^U = / s///p' < "$mf"`
+- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+- # We invoke sed twice because it is the simplest approach to
+- # changing $(DEPDIR) to its actual value in the expansion.
+- for file in `sed -n -e '
+- /^DEP_FILES = .*\\\\$/ {
+- s/^DEP_FILES = //
+- :loop
+- s/\\\\$//
+- p
+- n
+- /\\\\$/ b loop
+- p
+- }
+- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+@@ -1069,35 +907,207 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
++# serial 8
+
+-# 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.
++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+-# 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.
++# Do all the work for Automake. -*- Autoconf -*-
+
+-# 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.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 12
++
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.58])dnl
++dnl Autoconf wants to disallow AM_ names. We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++ if (cygpath --version) >/dev/null 2>/dev/null; then
++ CYGPATH_W='cygpath -w'
++ else
++ CYGPATH_W=echo
++ fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++ [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
++
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
++
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++ case $_am_header in
++ $1 | $1:* )
++ break ;;
++ * )
++ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # serial 2
+
++# Check whether the underlying file-system supports filenames
++# with a leading dot. For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++ am__leading_dot=.
++else
++ am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
++
++# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 5
++
++# AM_PROG_LEX
++# -----------
++# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
++# "missing" invocation, for better error output.
++AC_DEFUN([AM_PROG_LEX],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
++AC_REQUIRE([AC_PROG_LEX])dnl
++if test "$LEX" = :; then
++ LEX=${am_missing_run}flex
++fi])
++
++# Check to see how 'make' treats includes. -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
+ # AM_MAKE_INCLUDE()
+ # -----------------
+ # Check to see how make treats includes.
+ AC_DEFUN([AM_MAKE_INCLUDE],
+ [am_make=${MAKE-make}
+ cat > confinc << 'END'
+-doit:
++am__doit:
+ @echo done
++.PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+ AC_MSG_CHECKING([for style of include used by $am_make])
+@@ -1125,112 +1135,317 @@ if test "$am__include" = "#"; then
+ _am_result=BSD
+ fi
+ fi
+-AC_SUBST(am__include)
+-AC_SUBST(am__quote)
+-AC_MSG_RESULT($_am_result)
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
+ rm -f confinc confmf
+ ])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++# serial 4
+
+-# 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.
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+-# 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.
+
+-# serial 5
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
+
+-AC_PREREQ(2.52)
++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
+-if $2; then
+- $1_TRUE=
+- $1_FALSE='#'
++# AM_PROG_MKDIR_P
++# ---------------
++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++#
++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
++# created by `make install' are always world readable, even if the
++# installer happens to have an overly restrictive umask (e.g. 077).
++# This was a mistake. There are at least two reasons why we must not
++# use `-m 0755':
++# - it causes special bits like SGID to be ignored,
++# - it may be too restrictive (some setups expect 775 directories).
++#
++# Do not use -m 0755 and let people choose whatever they expect by
++# setting umask.
++#
++# We cannot accept any implementation of `mkdir' that recognizes `-p'.
++# Some implementations (such as Solaris 8's) are not thread-safe: if a
++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
++# concurrently, both version can detect that a/ is missing, but only
++# one can create it and the other will error out. Consequently we
++# restrict ourselves to GNU make (using the --version option ensures
++# this.)
++AC_DEFUN([AM_PROG_MKDIR_P],
++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ # We used to keeping the `.' as first argument, in order to
++ # allow $(mkdir_p) to be used without argument. As in
++ # $(mkdir_p) $(somedir)
++ # where $(somedir) is conditionally defined. However this is wrong
++ # for two reasons:
++ # 1. if the package is installed by a user who cannot write `.'
++ # make install will fail,
++ # 2. the above comment should most certainly read
++ # $(mkdir_p) $(DESTDIR)$(somedir)
++ # so it does not work when $(somedir) is undefined and
++ # $(DESTDIR) is not.
++ # To support the latter case, we have to write
++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++ # so the `.' trick is pointless.
++ mkdir_p='mkdir -p --'
+ else
+- $1_TRUE='#'
+- $1_FALSE=
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ for d in ./-p ./--version;
++ do
++ test -d $d && rmdir $d
++ done
++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++ if test -f "$ac_aux_dir/mkinstalldirs"; then
++ mkdir_p='$(mkinstalldirs)'
++ else
++ mkdir_p='$(install_sh) -d'
++ fi
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+- AC_MSG_ERROR([conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.])
+-fi])])
++AC_SUBST([mkdir_p])])
+
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++# Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++# serial 3
+
+-# 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.
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+-# 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.
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+-AC_PREREQ([2.52])
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+-# serial 6
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
++# serial 4
+
+-# 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.
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+-# 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.
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
+
+-# 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.
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
++else
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
+
+-# serial 3
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-AC_PREREQ(2.50)
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# AM_PROG_LEX
+-# -----------
+-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
+-# "missing" invocation, for better error output.
+-AC_DEFUN([AM_PROG_LEX],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+-AC_REQUIRE([AC_PROG_LEX])dnl
+-if test "$LEX" = :; then
+- LEX=${am_missing_run}flex
+-fi])
++# Check how to create a tarball. -*- Autoconf -*-
+
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++# tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++# $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [m4_case([$1], [ustar],, [pax],,
++ [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++ case $_am_tool in
++ gnutar)
++ for _am_tar in tar gnutar gtar;
++ do
++ AM_RUN_LOG([$_am_tar --version]) && break
++ done
++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++ am__untar="$_am_tar -xf -"
++ ;;
++ plaintar)
++ # Must skip GNU tar: if it does not support --format= it doesn't create
++ # ustar tarball either.
++ (tar --version) >/dev/null 2>&1 && continue
++ am__tar='tar chf - "$$tardir"'
++ am__tar_='tar chf - "$tardir"'
++ am__untar='tar xf -'
++ ;;
++ pax)
++ am__tar='pax -L -x $1 -w "$$tardir"'
++ am__tar_='pax -L -x $1 -w "$tardir"'
++ am__untar='pax -r'
++ ;;
++ cpio)
++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++ am__untar='cpio -i -H $1 -d'
++ ;;
++ none)
++ am__tar=false
++ am__tar_=false
++ am__untar=false
++ ;;
++ esac
++
++ # If the value was cached, stop now. We just wanted to have am__tar
++ # and am__untar set.
++ test -n "${am_cv_prog_tar_$1}" && break
++
++ # tar/untar a dummy directory, and stop if the command works
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ echo GrepMe > conftest.dir/file
++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++ rm -rf conftest.dir
++ if test -s conftest.tar; then
++ AM_RUN_LOG([$am__untar <conftest.tar])
++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++ fi
++done
++rm -rf conftest.dir
++
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
++m4_include([acinclude.m4])
Index: pkgsrc/games/corewars/patches/patch-configure_ac
diff -u /dev/null pkgsrc/games/corewars/patches/patch-configure_ac:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-configure_ac Thu Jun 25 07:52:15 2026
@@ -0,0 +1,52 @@
+$NetBSD: patch-configure_ac,v 1.1 2026/06/25 07:52:15 wiz Exp $
+
+Switch to gtk+2.
+From Debian's corewars_0.9.13+ds-1.diff.
+
+--- configure.ac.orig Wed Oct 23 14:49:46 2002
++++ configure.ac Wed Mar 24 23:16:44 2010
+@@ -36,38 +36,29 @@ AM_PROG_LEX
+ AC_PROG_LN_S
+
+ COREWARS=corewars
+-AM_PATH_GLIB(1.2.0,,COREWARS=;AC_MSG_ERROR([
++AM_PATH_GLIB_2_0(2.0.0,,COREWARS=;AC_MSG_ERROR([
+
+ ************************************************************************
+- *** GLIB >= 1.2.0 not installed - cannot build GUI client without it ***
++ *** GLIB >= 2.0.0 not installed - cannot build GUI client without it ***
+ ************************************************************************
+ ]))
+-AM_PATH_GTK(1.2.0,,COREWARS=;AC_MSG_ERROR([
++AM_PATH_GTK_2_0(2.0.0,,COREWARS=;AC_MSG_ERROR([
+
+ ************************************************************************
+- *** GTK+ >= 1.2.0 not installed - cannot build GUI client without it ***
++ *** GTK+ >= 2.0.0 not installed - cannot build GUI client without it ***
+ ************************************************************************
+ ]))
+
+ LIBS="$LIBS $GTK_LIBS"
+-GTK_INCLUDE=`gtk-config --cflags`
+ AC_SUBST(INCLUDES)
+-INCLUDES="$INCLUDES $GTK_INCLUDE"
++INCLUDES="$INCLUDES $GTK_CFLAGS"
+
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_STDC_HEADERS
+ AC_CHECK_HEADERS(limits.h malloc.h string.h unistd.h)
+
+-dnl Check for libc >= 2.1
+-COREWARSCMD=
+-AC_CHECK_HEADERS(argp.h,COREWARSCMD=corewars-cmd,AC_MSG_WARN([
+-
+- ********************************************************************************
+- *** glibc >= 2.1 not installed - cannot build command line client without it ***
+- *** (but this is ok if you want the GTK+ client only) ***
+- ********************************************************************************
+-]))
++COREWARSCMD=corewars-cmd
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
Index: pkgsrc/games/corewars/patches/patch-doc-corewars_6
diff -u /dev/null pkgsrc/games/corewars/patches/patch-doc-corewars_6:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-doc-corewars_6 Thu Jun 25 07:52:16 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc-corewars_6,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Adapt manpage for argp patch.
+
+--- doc/corewars.6.orig Wed Apr 12 15:10:09 2000
++++ doc/corewars.6 Wed Mar 24 23:04:18 2010
+@@ -38,7 +38,7 @@ called \fBRedcode\fP, is harder to learn but also more
+ .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+ .\" respectively.
+ .SH OPTIONS
+-Use \fBcorewars-cmd --help\fP to get a list of supported command line options.
++Use \fBcorewars-cmd -H\fP to get a list of supported command line options.
+ .br
+ .SH AUTHORS
+ This manual page was written by Michael Vogt <mvogt%acm.org@localhost>,
Index: pkgsrc/games/corewars/patches/patch-src_dirbrowser_c
diff -u /dev/null pkgsrc/games/corewars/patches/patch-src_dirbrowser_c:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-src_dirbrowser_c Thu Jun 25 07:52:16 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_dirbrowser_c,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Switch to gtk+2.
+From Debian's corewars_0.9.13+ds-1.diff.
+
+--- src/dirbrowser.c.orig Wed Mar 24 23:07:32 2010
++++ src/dirbrowser.c Wed Mar 24 23:07:42 2010
+@@ -232,7 +232,7 @@ GtkWidget *create_dir_browser(gchar *title,gchar *curr
+ DirNode *dirnode;
+ gboolean leaf;
+
+- window=gtk_window_new(GTK_WINDOW_DIALOG);
++ window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(window),title);
+ gtk_container_border_width(GTK_CONTAINER(window),10);
+
Index: pkgsrc/games/corewars/patches/patch-src_main-cmd_c
diff -u /dev/null pkgsrc/games/corewars/patches/patch-src_main-cmd_c:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-src_main-cmd_c Thu Jun 25 07:52:16 2026
@@ -0,0 +1,205 @@
+$NetBSD: patch-src_main-cmd_c,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Avoid argp.
+
+--- src/main-cmd.c.orig Wed Oct 23 13:30:59 2002
++++ src/main-cmd.c Sun Nov 26 01:28:49 2006
+@@ -19,11 +19,13 @@
+
+ #include "config.h"
+
+-#ifdef HAVE_ARGP_H
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <argp.h>
++#ifdef HAVE_ARGP_H
++# include <argp.h>
++#else
++# include <unistd.h>
++#endif
+ #include <math.h>
+ #include <string.h>
+ #include <time.h>
+@@ -51,6 +53,7 @@ int score_old = 0;
+ int dump = 0;
+ int dump_internal = 0;
+
++#ifdef HAVE_ARGP
+ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+ {
+ char *p;
+@@ -260,7 +263,162 @@ struct argp argp =
+ "%s for the score, %t for the title, %a for the author and %f for the filename. "
+ "The default format string is '%4r %7s %-25t %a'.",
+ };
++#else
++void
++usage(int c)
++{
++ fprintf(stderr, "%s, by %s\n", argp_program_version,
++ argp_program_bug_address);
++ if (c)
++ fprintf(stderr, "Invalid argument for -%c\n", c);
++ fprintf(stderr, "Usage:\n"
++ "\tcorewars [-bghHinopxy] [-a SCORE] [-c SCORE] [-d NUMBER]\n"
++ "\t\t[-e CELLS] [-f FORMAT] [-k SCORE] [-l COREWARS|REDCODE]\n"
++ "\t\t[-m CYCLES] [-r NUMBER] [-s SIZE] [-t THREADS]\n"
++ "\t\t[-z CELLS]\n");
++ exit(1);
++}
+
++void
++description()
++{
++ fprintf(stderr, "%s, by %s\n", argp_program_version,
++ argp_program_bug_address);
++ fprintf(stderr,
++" -l LANGUAGE Select language (COREWARS or REDCODE, default COREWARS)\n"
++" -s SIZE Set memory size (cells, 625<=SIZE<=1000000, default 6400)\n"
++" -m CYCLES Set maximum number of cycles to execute (default 1000000)\n"
++" -t THREADS Set maximum threads a process may have (default 1000)\n"
++" -e CELLS Set maximum program size (default 200)\n"
++" -z CELLS Set minimum distance (default 100)\n"
++" -y Don't stop when only one process left\n"
++" -d NUMBER Set number of copies to load per default (default 1)\n"
++" -r NUMBER Set number of games to play (default 1)\n"
++" -i Forbid self move instruction (default off)\n"
++" -a SCORE Score for every step the process was alive (default 1)\n"
++" -c SCORE Score for every cell the process owns (default 1)\n"
++" -k SCORE Score for evey other process the process has killed (default 100)\n"
++" -o Old-Style scoring, the only surviving process gets 3 points,\n"
++" a surviving process gets 1 point\n"
++" -n Use rank in each game to create final score\n"
++" (instead of the game score)\n"
++" -b Use score from best copy (instead of summing the scores\n"
++" of all copies)\n"
++" -x Suppress initialisation of the random number generator\n"
++" -f FORMAT Set the format for the highscore table\n"
++" -h Suppress highscore table header\n"
++" -p Dump the programs and exit\n"
++" -g Dump the programs using an internal format and exit\n"
++" -H Display this page\n");
++ exit(0);
++}
++
++void
++old_fashioned_parse(int argc, char *argv[], char ***file_list)
++{
++ int c;
++ char *p;
++
++ while ((c = getopt(argc, argv,
++ "Hl:s:m:t:e:z:yd:r:ia:c:k:onbxf:hpg")) != -1)
++ switch(c) {
++ case 'l':
++ if (strcmp(optarg, "COREWARS") == 0)
++ LANGUAGE = LANGUAGE_CW;
++ else if (strcmp(optarg, "REDCODE") == 0)
++ LANGUAGE = LANGUAGE_RC;
++ else
++ usage(0);
++ break;
++ case 's':
++ SIZE = atoi(optarg);
++ if (SIZE < SIZE_MIN || SIZE > SIZE_MAX) {
++ usage(c);
++ }
++ DIMENSIONX = (int) sqrt(SIZE);
++ DIMENSIONY = (SIZE+DIMENSIONX-1) / DIMENSIONX;
++ break;
++ case 'm':
++ MAX_CYCLES = atoi(optarg);
++ if (MAX_CYCLES < 1)
++ usage(c);
++ break;
++ case 't':
++ MAX_THREADS = atoi(optarg);
++ if (MAX_THREADS < 1)
++ usage(c);
++ break;
++ case 'e':
++ MAX_LENGTH = atoi(optarg);
++ if (MAX_LENGTH < 1)
++ usage(c);
++ break;
++ case 'z':
++ MIN_DISTANCE = strtol(optarg, &p, 0);
++ if (*optarg == '\0' || *p != '\0')
++ usage(c);
++ break;
++ case 'y':
++ STOP_EARLY = 0;
++ break;
++ case 'd':
++ default_count = atoi(optarg);
++ if (default_count < 1)
++ usage(c);
++ break;
++ case 'r':
++ repeats = atoi(optarg);
++ if (repeats < 1)
++ usage(c);
++ break;
++ case 'i':
++ ALLOW_SELF_MOVE = 0;
++ break;
++ case 'a':
++ SCORE_ALIVE = strtol(optarg, &p, 0);
++ if (*optarg == '\0' || *p != '\0')
++ usage(c);
++ break;
++ case 'c':
++ SCORE_CELLS = strtol(optarg, &p, 0);
++ if (*optarg == '\0' || *p != '\0')
++ usage(c);
++ break;
++ case 'k':
++ SCORE_KILLS = strtol(optarg, &p, 0);
++ if (*optarg == '\0' || *p != '\0')
++ usage(c);
++ break;
++ case 'o':
++ score_old = 1;
++ break;
++ case 'n':
++ SCORE_RANK = 1;
++ break;
++ case 'b':
++ SCORE_BEST = 1;
++ break;
++ case 'x':
++ reproducible = 1;
++ break;
++ case 'f':
++ format = optarg;
++ break;
++ case 'p':
++ dump = 1;
++ break;
++ case 'g':
++ dump_internal = 1;
++ break;
++ default:
++ description();
++ break;
++ }
++ *file_list = argv+optind;
++}
++#endif
++
++
+ int main(int argc,char *argv[])
+ {
+ char **file_list;
+@@ -271,7 +429,10 @@ int main(int argc,char *argv[])
+ struct program **table;
+ char *s;
+
++#ifdef HAVE_ARGP
+ argp_parse (&argp, argc, argv,0 ,0 , &file_list);
++#else
++ old_fashioned_parse(argc, argv, &file_list);
+
+ if (!reproducible)
+ srandom (time (0));
Index: pkgsrc/games/corewars/patches/patch-src_main-gui_c
diff -u /dev/null pkgsrc/games/corewars/patches/patch-src_main-gui_c:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-src_main-gui_c Thu Jun 25 07:52:16 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_main-gui_c,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Switch to gtk+2.
+From Debian's corewars_0.9.13+ds-1.diff.
+
+--- src/main-gui.c.orig Wed Mar 24 23:07:02 2010
++++ src/main-gui.c Wed Mar 24 23:07:23 2010
+@@ -348,7 +348,7 @@ void get_main_menu( GtkWidget *window,
+ gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
+
+ /* Attach the new accelerator group to the window. */
+- gtk_accel_group_attach (accel_group, GTK_OBJECT (window));
++ gtk_window_add_accel_group(GTK_WINDOW (window), accel_group);
+
+ menu_file_start = gtk_item_factory_get_widget (item_factory, "/File/Start");
+ menu_file_pause = gtk_item_factory_get_widget (item_factory, "/File/Pause");
Index: pkgsrc/games/corewars/patches/patch-src_parser-cw_y
diff -u /dev/null pkgsrc/games/corewars/patches/patch-src_parser-cw_y:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-src_parser-cw_y Thu Jun 25 07:52:16 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_parser-cw_y,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Fix -no-common build error.
+
+Index: src/parser-cw.y
+--- src/parser-cw.y.orig
++++ src/parser-cw.y
+@@ -29,8 +29,8 @@
+ #include "program-cw.h"
+ #include "options.h"
+
+- int current_line;
+- struct cw_line *root_line;
++ static int current_line;
++ static struct cw_line *root_line;
+ char cw_error_message[1024];
+
+ void cw_error (char *s);
Index: pkgsrc/games/corewars/patches/patch-src_parser-rc_y
diff -u /dev/null pkgsrc/games/corewars/patches/patch-src_parser-rc_y:1.1
--- /dev/null Thu Jun 25 07:52:16 2026
+++ pkgsrc/games/corewars/patches/patch-src_parser-rc_y Thu Jun 25 07:52:16 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_parser-rc_y,v 1.1 2026/06/25 07:52:16 wiz Exp $
+
+Fix -no-common build error.
+
+Index: src/parser-rc.y
+--- src/parser-rc.y.orig
++++ src/parser-rc.y
+@@ -66,8 +66,9 @@
+ void free_expr(struct expr *expr);
+ struct expr *copy_expr(struct expr *expr);
+
+- int current_line, *current_cell;
+- struct line *root_line;
++ int *current_cell;
++ static int current_line;
++ static struct line *root_line;
+ struct expr *org;
+ struct label *label_list;
+ struct label *for_index;
Home |
Main Index |
Thread Index |
Old Index