|
From: <fa...@us...> - 2008-05-05 19:50:52
|
Revision: 18766
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18766&view=rev
Author: fabbo
Date: 2008-05-05 12:50:53 -0700 (Mon, 05 May 2008)
Log Message:
-----------
New joystick architecture. Drivers are small and reside in folder joystickdrv
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4
branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/configure
branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/man/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/po/POTFILES.in
branches/fabrizio/v1.22.13-newjoydesign/vice/po/cat-id-tbl.c
branches/fabrizio/v1.22.13-newjoydesign/vice/po/vice.pot
branches/fabrizio/v1.22.13-newjoydesign/vice/src/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/src/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/kbd/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/snippets/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/c64ui.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uijoystick2.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/vic20ui.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/vsyncarch.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/utils/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/cbm2/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/config.h.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/core/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/crtc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/diskimage/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/c64exp/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/plus4exp/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec128dcr/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iecieee/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/ieee/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/tcbm/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/fileio/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/fsdevice/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/iecbus/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/imagecontents/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/init.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/keyboard.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/lpng/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/zlib/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/machine.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/parallel/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/pet/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/printerdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/rs232drv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/serial/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/sid/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/tape/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/Makefile.in
Added Paths:
-----------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/Makefile
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_directinput.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_unix.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_unix_digi_old.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_unix_old.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_winmm.c
Removed Paths:
-------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/joy.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/joy.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/joy_usb.c
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in 2008-05-01 13:19:26 UTC (rev 18765)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in 2008-05-05 19:50:53 UTC (rev 18766)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -15,15 +15,11 @@
@SET_MAKE@
# Process this file with automake to produce Makefile.in
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -37,18 +33,18 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh missing mkinstalldirs
-subdir = .
+ install-sh missing mkinstalldirs ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
@@ -56,10 +52,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -75,12 +74,6 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@
-ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@
-AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ARCH_DIR = @ARCH_DIR@
@@ -92,8 +85,6 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@
-BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@
BINDIR = @BINDIR@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
@@ -103,8 +94,6 @@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS = @CROSS@
-CROSS_FALSE = @CROSS_FALSE@
-CROSS_TRUE = @CROSS_TRUE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -127,24 +116,13 @@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
-GNOMEUI_FALSE = @GNOMEUI_FALSE@
-GNOMEUI_TRUE = @GNOMEUI_TRUE@
GREP = @GREP@
GTKGL_CFLAGS = @GTKGL_CFLAGS@
GTKGL_LIBS = @GTKGL_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@
-HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@
HAVE_READLINE = @HAVE_READLINE@
-HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@
-HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@
-HAVE_RESID_FALSE = @HAVE_RESID_FALSE@
-HAVE_RESID_TRUE = @HAVE_RESID_TRUE@
-HAVE_RS232_FALSE = @HAVE_RS232_FALSE@
-HAVE_RS232_TRUE = @HAVE_RS232_TRUE@
-HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@
-HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -153,6 +131,7 @@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
+JOYSTICK_DRIVERS = @JOYSTICK_DRIVERS@
JOY_LIBS = @JOY_LIBS@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
@@ -163,25 +142,16 @@
LINKCC = @LINKCC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@
-MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@
-MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@
-MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@
MSGFMT = @MSGFMT@
-NEED_READLINE_FALSE = @NEED_READLINE_FALSE@
-NEED_READLINE_TRUE = @NEED_READLINE_TRUE@
NETPLAY_LIBS = @NETPLAY_LIBS@
NLS_LOCALEDIR = @NLS_LOCALEDIR@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJEXT = @OBJEXT@
-OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@
-OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -200,8 +170,6 @@
RESID_DIR = @RESID_DIR@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
-RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@
-RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
@@ -215,32 +183,8 @@
STRIP = @STRIP@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
-UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@
-UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@
-UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@
-UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@
-UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@
-UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@
-UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@
-UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@
UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@
-UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@
-UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@
-UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@
-UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@
-UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@
-UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@
-UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@
-UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@
-UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@
-UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@
-UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@
-UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@
-UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@
-UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@
-USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
VERSION_RC = @VERSION_RC@
@@ -258,8 +202,6 @@
VICE_ZLIB_DEP = @VICE_ZLIB_DEP@
VICE_ZLIB_DIR = @VICE_ZLIB_DIR@
VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@
-WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@
-WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@
WINDRES = @WINDRES@
WRC = @WRC@
X128_WINRES = @X128_WINRES@
@@ -277,14 +219,12 @@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -297,6 +237,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
cxx = @cxx@
datadir = @datadir@
datarootdir = @datarootdir@
@@ -326,9 +267,12 @@
sbindir = @sbindir@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
x128_LDFLAGS = @x128_LDFLAGS@
x64_LDFLAGS = @x64_LDFLAGS@
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
@@ -373,7 +317,6 @@
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -406,8 +349,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -509,24 +451,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/po $(distdir)/src
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -540,7 +480,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -548,6 +488,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -555,7 +497,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -630,7 +572,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -698,12 +640,20 @@
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -724,23 +674,25 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-recursive distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
.PHONY: x64 x128 xvic xpet xplus4 xcbm2
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4 2008-05-01 13:19:26 UTC (rev 18765)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4 2008-05-05 19:50:53 UTC (rev 18766)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 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.
@@ -11,7 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -21,14 +26,29 @@
# ----------------------------
# 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.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -85,14 +105,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# 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 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -101,8 +121,10 @@
[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])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -116,15 +138,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# 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 8
+# serial 9
# 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,
@@ -152,6 +173,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -217,6 +239,7 @@
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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
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
@@ -269,7 +292,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -294,8 +318,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -354,8 +379,8 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -378,16 +403,20 @@
# 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
+[AC_PREREQ([2.60])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])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -407,6 +436,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -442,6 +474,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -477,7 +513,7 @@
# 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"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -576,14 +612,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 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.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -599,6 +635,7 @@
# 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
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -609,7 +646,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -617,60 +654,23 @@
# 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.)
+# Check for `mkdir -p'.
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
- # 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_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
@@ -782,9 +782,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 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_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in 2008-05-01 13:19:26 UTC (rev 18765)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in 2008-05-05 19:50:53 UTC (rev 18766)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,12 +45,6 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@
-ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@
-AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ARCH_DIR = @ARCH_DIR@
@@ -66,8 +56,6 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@
-BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@
BINDIR = @BINDIR@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
@@ -77,8 +65,6 @@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS = @CROSS@
-CROSS_FALSE = @CROSS_FALSE@
-CROSS_TRUE = @CROSS_TRUE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -101,24 +87,13 @@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
-GNOMEUI_FALSE = @GNOMEUI_FALSE@
-GNOMEUI_TRUE = @GNOMEUI_TRUE@
GREP = @GREP@
GTKGL_CFLAGS = @GTKGL_CFLAGS@
GTKGL_LIBS = @GTKGL_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@
-HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@
HAVE_READLINE = @HAVE_READLINE@
-HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@
-HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@
-HAVE_RESID_FALSE = @HAVE_RESID_FALSE@
-HAVE_RESID_TRUE = @HAVE_RESID_TRUE@
-HAVE_RS232_FALSE = @HAVE_RS232_FALSE@
-HAVE_RS232_TRUE = @HAVE_RS232_TRUE@
-HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@
-HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -127,6 +102,7 @@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
+JOYSTICK_DRIVERS = @JOYSTICK_DRIVERS@
JOY_LIBS = @JOY_LIBS@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
@@ -137,25 +113,16 @@
LINKCC = @LINKCC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@
-MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@
-MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@
-MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@
MSGFMT = @MSGFMT@
-NEED_READLINE_FALSE = @NEED_READLINE_FALSE@
-NEED_READLINE_TRUE = @NEED_READLINE_TRUE@
NETPLAY_LIBS = @NETPLAY_LIBS@
NLS_LOCALEDIR = @NLS_LOCALEDIR@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJEXT = @OBJEXT@
-OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@
-OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -174,8 +141,6 @@
RESID_DIR = @RESID_DIR@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
-RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@
-RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
@@ -189,32 +154,8 @@
STRIP = @STRIP@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
-UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@
-UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@
-UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@
-UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@
-UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@
-UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@
-UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@
-UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@
UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@
-UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@
-UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@
-UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@
-UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@
-UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@
-UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@
-UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@
-UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@
-UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@
-UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@
-UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@
-UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@
-UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@
-UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@
-USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
VERSION_RC = @VERSION_RC@
@@ -232,8 +173,6 @@
VICE_ZLIB_DEP = @VICE_ZLIB_DEP@
VICE_ZLIB_DIR = @VICE_ZLIB_DIR@
VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@
-WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@
-WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@
WINDRES = @WINDRES@
WRC = @WRC@
X128_WINRES = @X128_WINRES@
@@ -251,14 +190,12 @@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -271,6 +208,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
cxx = @cxx@
datadir = @datadir@
datarootdir = @datarootdir@
@@ -300,9 +238,12 @@
sbindir = @sbindir@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
x128_LDFLAGS = @x128_LDFLAGS@
x64_LDFLAGS = @x64_LDFLAGS@
xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
@@ -360,7 +301,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -369,23 +309,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/amigaos $(distdir)/beos $(distdir)/macosx $(distdir)/mingw32 $(distdir)/minix3 $(distdir)/qnx4 $(distdir)/riscos $(distdir)/vms
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -444,12 +382,20 @@
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -468,16 +414,19 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/configure
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/configure 2008-05-01 13:19:26 UTC (rev 18765)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/configure 2008-05-05 19:50:53 UTC (rev 18766)
@@ -657,6 +657,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -804,6 +805,7 @@
GTKGL_LIBS
VICE_SYNC
FULLSCREEN_DRIVERS
+JOYSTICK_DRIVERS
HAVE_REALDEVICE_TRUE
HAVE_REALDEVICE_FALSE
x64_LDFLAGS
@@ -1979,7 +1981,8 @@
fi
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2162,39 +2165,54 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-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 --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # 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)'
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2276,12 +2294,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2324,7 +2346,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2428,7 +2450,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2698,9 +2720,7 @@
fi
-
-
-if test x"$enable_gnomeui" = "xyes"; then
+ if test x"$enable_gnomeui" = "xyes"; then
GNOMEUI_TRUE=
GNOMEUI_FALSE='#'
else
@@ -2717,9 +2737,7 @@
fi
-
-
-if test x"$with_cocoa" = "xyes"; then
+ if test x"$with_cocoa" = "xyes"; then
MACOSX_COCOA_TRUE=
MACOSX_COCOA_FALSE='#'
else
@@ -3711,9 +3729,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3723,7 +3739,6 @@
-
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3791,6 +3806,7 @@
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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
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
@@ -3820,9 +3836,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3907,6 +3921,7 @@
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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
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
@@ -3936,9 +3951,7 @@
echo "${ECHO_T}$am_cv_OBJC_dependencies_compiler_type" >&6; }
OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then
am__fastdepOBJC_TRUE=
@@ -4001,9 +4014,7 @@
echo "using Allegro sound driver"
fi
-
-
-if false; then
+ if false; then
HAVE_RS232_TRUE=
HAVE_RS232_FALSE='#'
else
@@ -4011,9 +4022,7 @@
HAVE_RS232_FALSE=
fi
-
-
-if false; then
+ if false; then
HAVE_RAWDRIVE_TRUE=
HAVE_RAWDRIVE_FALSE='#'
else
@@ -4047,9 +4056,7 @@
fi
elif test x"$host_os" = "xamigaos" -o x"$host_os" = "xamigaos4" -o x"$host_os" = "xamithlon" -o x"$host_os" = "xaros" -o x"$host_os" = "xmorphos" -o x"$host_os" = "xwarpos" -o x"$host_os" = "xpowerup"; then
-
-
-if true; then
+ if true; then
HAVE_RS232_TRUE=
HAVE_RS232_FALSE='#'
else
@@ -4057,9 +4064,7 @@
HAVE_RS232_FALSE=
fi
-
-
-if true; then
+ if true; then
HAVE_RAWDRIVE_TRUE=
HAVE_RAWDRIVE_FALSE='#'
else
@@ -4254,9 +4259,7 @@
#define HAVE_RS232
_ACEOF
-
-
-if true; then
+ if true; then
HAVE_RS232_TRUE=
HAVE_RS232_FALSE='#'
else
@@ -4264,9 +4267,7 @@
HAVE_RS232_FALSE=
fi
-
-
-if false; then
+ if false; then
HAVE_RAWDRIVE_TRUE=
HAVE_RAWDRIVE_FALSE='#'
else
@@ -4407,7 +4408,785 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+ JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joy_winmm.o"
+cat >>confdefs.h <<\_ACEOF
+#define USE_WINMM_JOY
+_ACEOF
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Synta...
[truncated message content] |