|
From: <bla...@us...> - 2008-05-25 23:14:18
|
Revision: 18811
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18811&view=rev
Author: blackystardust
Date: 2008-05-25 16:14:26 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Updated to 1.22.16
Modified Paths:
--------------
branches/marco/ports/vice/ChangeLog
branches/marco/ports/vice/Makefile.am
branches/marco/ports/vice/aclocal.m4
branches/marco/ports/vice/autogen.sh
branches/marco/ports/vice/build/Makefile.am
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/data/C64/Makefile.am
branches/marco/ports/vice/data/C64/osx_pos.vkm
branches/marco/ports/vice/data/C64/osx_sym.vkm
branches/marco/ports/vice/depcomp
branches/marco/ports/vice/missing
branches/marco/ports/vice/po/de.po
branches/marco/ports/vice/po/fr.po
branches/marco/ports/vice/po/hu.po
branches/marco/ports/vice/po/it.po
branches/marco/ports/vice/po/nl.po
branches/marco/ports/vice/po/pl.po
branches/marco/ports/vice/po/stamp-cat-id
branches/marco/ports/vice/po/sv.po
branches/marco/ports/vice/po/vice.pot
branches/marco/ports/vice/src/ChangeLog
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/archdep.h
branches/marco/ports/vice/src/arch/unix/macosx/Info.plist
branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/console.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/fullscreen.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/kbd.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/kbd.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/main.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64controller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64controller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/uimon.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/viceapplication.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/viceapplication.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/vicemachine.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/vicemachine.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/video.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/videoarch.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/fullscreenwindow.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/vicewindow.m
branches/marco/ports/vice/src/arch/unix/macosx/make-bindist.sh
branches/marco/ports/vice/src/arch/win32/signals.c
branches/marco/ports/vice/src/resid/aclocal.m4
branches/marco/ports/vice/src/resid/config.guess
branches/marco/ports/vice/src/resid/config.sub
branches/marco/ports/vice/src/resid/configure
branches/marco/ports/vice/src/resid/depcomp
branches/marco/ports/vice/src/resid/install-sh
branches/marco/ports/vice/src/resid/missing
branches/marco/ports/vice/src/resid/mkinstalldirs
branches/marco/ports/vice/src/version.h
Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/ChangeLog 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,3 +1,33 @@
+2008-05-25 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.16.
+
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * configure.in: honor OBJCFLAGS if available. added Carbon lib
+ for Cocoa linking.
+
+ * build/Makefile.am, build/macosx/build-vice-release.sh: added
+ build-vice-release script
+
+ * Makefile.am: make bindist on Macs need the bash
+
+ * data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
+ data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
+ maps
+
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * autogen.sh: Removed "bash-ism" from script (compare with "=="
+ instead of "=").
+
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot,
+ po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo,
+ po/de.gmo, po/sv.gmo: Removed some more auto-generated or
+ unnecessary files.
+
2008-05-18 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.15.
Modified: branches/marco/ports/vice/Makefile.am
===================================================================
--- branches/marco/ports/vice/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -60,10 +60,10 @@
if UNIX_MACOSX_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
endif
if UNIX_SKYOS_COMPILE
Modified: branches/marco/ports/vice/aclocal.m4
===================================================================
--- branches/marco/ports/vice/aclocal.m4 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/aclocal.m4 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,884 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# 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.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.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# 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.
-
-# 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/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-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_CONDITIONAL -*- Autoconf -*-
-
-# 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.
-
-# serial 7
-
-# 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
-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])])
-
-
-# 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.
-
-# serial 8
-
-# 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...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-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], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # 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.
- : > 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)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # 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=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
- # 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
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --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='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# 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.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # 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
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # 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 '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
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# 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.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# 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'
-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])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# 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.
-
-# serial 4
-
-# 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
-])
-
-# 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_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
- # 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])])
-
-# Helper functions for option handling. -*- 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_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])])
-
-# 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.
-
-# serial 4
-
-# 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)])
-
-# 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_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])])
-
-# 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])
Modified: branches/marco/ports/vice/autogen.sh
===================================================================
--- branches/marco/ports/vice/autogen.sh 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/autogen.sh 2008-05-25 23:14:26 UTC (rev 18811)
@@ -89,7 +89,7 @@
buildfiles
-if [ x"$1" == x"--dist" ]; then
+if [ x"$1" = x"--dist" ]; then
./configure
(cd src/monitor/; make mon_lex.c mon_parse.c)
Modified: branches/marco/ports/vice/build/Makefile.am
===================================================================
--- branches/marco/ports/vice/build/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/build/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -11,6 +11,7 @@
macosx/build-readline.sh \
macosx/build-vice-dist.sh \
macosx/build-ffmpeglame.sh \
+ macosx/build-vice-release.sh \
minix3/build.sh \
minix3/build-package.sh \
qnx4/build.sh \
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/configure.in 2008-05-25 23:14:26 UTC (rev 18811)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=15
+VICE_VERSION_BUILD=16
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
@@ -102,7 +102,9 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-OBJCFLAGS="${CFLAGS}"
+if [ "x${OBJCFLAGS}" = x ]; then
+ OBJCFLAGS="${CFLAGS}"
+fi
OBJCDEPMODE="depmode=${CC}"
AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS)
@@ -1834,7 +1836,7 @@
ARCH_LIBS="$ARCH_DIR/macosx/cocoa/menu/libarchmacosxcocoamenu.a $ARCH_DIR/macosx/cocoa/dialog/libarchmacosxcocoadialog.a $ARCH_DIR/macosx/cocoa/libarchmacosxcocoa.a $ARCH_DIR/macosx/cocoa/view/libarchmacosxcocoaview.a $ARCH_DIR/macosx/libarchmacosx.a $ARCH_DIR/libarch.a $ARCH_LIBS"
ARCH_INCLUDES="-I$ARCH_SRC_DIR/macosx/cocoa/menu -I$ARCH_SRC_DIR/macosx/cocoa/dialog -I$ARCH_SRC_DIR/macosx/cocoa/view -I$ARCH_SRC_DIR/macosx/cocoa -I$ARCH_SRC_DIR $ARCH_INCLUDES"
ARCH_EXTRA_SUBDIR="macosx macosx/cocoa macosx/cocoa/view macosx/cocoa/menu macosx/cocoa/dialog"
- UI_LIBS="-framework Cocoa -framework OpenGL"
+ UI_LIBS="-framework Cocoa -framework OpenGL -framework Carbon"
UNIX_MACOSX_UITYPE=cocoa
else
ARCH_LIBS="$ARCH_DIR/macosx/libarchmacosx.a $ARCH_LIBS"
Modified: branches/marco/ports/vice/data/C64/Makefile.am
===================================================================
--- branches/marco/ports/vice/data/C64/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: branches/marco/ports/vice/data/C64/osx_pos.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_pos.vkm 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/osx_pos.vkm 2008-05-25 23:14:26 UTC (rev 18811)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Modified: branches/marco/ports/vice/data/C64/osx_sym.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_sym.vkm 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/osx_sym.vkm 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Modified: branches/marco/ports/vice/depcomp
===================================================================
--- branches/marco/ports/vice/depcomp 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/depcomp 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,530 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, 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.
-
-# Originally written by Alexandre Oliva <ol...@dc...>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug...@gn...>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, be...
[truncated message content] |