[vba-commit] VisualBoyAdvance VERSION,NONE,1.1 compile,NONE,1.1 config.rpath,NONE,1.1 AUTHORS,1.2,1.3 Makefile.am,1.7,1.8 Makefile.in,1.10,1.11 aclocal.m4,1.3,1.4 configure,1.20,1.21 configure.in,1.19,1.20 mkinstalldirs,1.1,1.2

[S?bastien G. <kx...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551

Modified Files:
	AUTHORS Makefile.am Makefile.in aclocal.m4 configure 
	configure.in mkinstalldirs 
Added Files:
	VERSION compile config.rpath 
Log Message:
GTK+ frontend draft added.

Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/mkinstalldirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mkinstalldirs	20 Oct 2002 13:03:12 -0000	1.1
--- mkinstalldirs	29 Mar 2004 22:08:37 -0000	1.2
***************
*** 5,10 ****
  # Public domain
  
- # $Id$
- 
  errstatus=0
  dirmode=""
--- 5,8 ----
***************
*** 15,30 ****
  # process command line arguments
  while test $# -gt 0 ; do
!    case "${1}" in
!      -h | --help | --h* )			# -h for help
! 	echo "${usage}" 1>&2; exit 0 ;;
!      -m )					# -m PERM arg
! 	shift
! 	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
! 	dirmode="${1}"
! 	shift ;;
!      -- ) shift; break ;;			# stop option processing
!      -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
!      * )  break ;;				# first non-opt arg
!    esac
  done
  
--- 13,39 ----
  # process command line arguments
  while test $# -gt 0 ; do
!   case $1 in
!     -h | --help | --h*)         # -h for help
!       echo "$usage" 1>&2
!       exit 0
!       ;;
!     -m)                         # -m PERM arg
!       shift
!       test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
!       dirmode=$1
!       shift
!       ;;
!     --)                         # stop option processing
!       shift
!       break
!       ;;
!     -*)                         # unknown option
!       echo "$usage" 1>&2
!       exit 1
!       ;;
!     *)                          # first non-opt arg
!       break
!       ;;
!   esac
  done
  
***************
*** 39,94 ****
  
  case $# in
! 0) exit 0 ;;
  esac
  
  case $dirmode in
! '')
!   if mkdir -p -- . 2>/dev/null; then
!     echo "mkdir -p -- $*"
!     exec mkdir -p -- "$@"
!   fi ;;
! *)
!   if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
!     echo "mkdir -m $dirmode -p -- $*"
!     exec mkdir -m "$dirmode" -p -- "$@"
!   fi ;;
  esac
  
  for file
  do
!    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
!    shift
! 
!    pathcomp=
!    for d
!    do
!      pathcomp="$pathcomp$d"
!      case "$pathcomp" in
!        -* ) pathcomp=./$pathcomp ;;
!      esac
  
!      if test ! -d "$pathcomp"; then
! 	echo "mkdir $pathcomp"
  
! 	mkdir "$pathcomp" || lasterr=$?
  
! 	if test ! -d "$pathcomp"; then
! 	  errstatus=$lasterr
! 	else
! 	  if test ! -z "$dirmode"; then
! 	     echo "chmod $dirmode $pathcomp"
  
! 	     lasterr=""
! 	     chmod "$dirmode" "$pathcomp" || lasterr=$?
  
! 	     if test ! -z "$lasterr"; then
! 	       errstatus=$lasterr
! 	     fi
! 	  fi
! 	fi
!      fi
  
!      pathcomp="$pathcomp/"
!    done
  done
  
--- 48,104 ----
  
  case $# in
!   0) exit 0 ;;
  esac
  
  case $dirmode in
!   '')
!     if mkdir -p -- . 2>/dev/null; then
!       echo "mkdir -p -- $*"
!       exec mkdir -p -- "$@"
!     fi
!     ;;
!   *)
!     if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
!       echo "mkdir -m $dirmode -p -- $*"
!       exec mkdir -m "$dirmode" -p -- "$@"
!     fi
!     ;;
  esac
  
  for file
  do
!   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
!   shift
  
!   pathcomp=
!   for d
!   do
!     pathcomp="$pathcomp$d"
!     case $pathcomp in
!       -*) pathcomp=./$pathcomp ;;
!     esac
  
!     if test ! -d "$pathcomp"; then
!       echo "mkdir $pathcomp"
  
!       mkdir "$pathcomp" || lasterr=$?
  
!       if test ! -d "$pathcomp"; then
!   	errstatus=$lasterr
!       else
!   	if test ! -z "$dirmode"; then
! 	  echo "chmod $dirmode $pathcomp"
!     	  lasterr=""
!   	  chmod "$dirmode" "$pathcomp" || lasterr=$?
  
!   	  if test ! -z "$lasterr"; then
!   	    errstatus=$lasterr
!   	  fi
!   	fi
!       fi
!     fi
  
!     pathcomp="$pathcomp/"
!   done
  done
  
***************
*** 97,101 ****
  # Local Variables:
  # mode: shell-script
! # sh-indentation: 3
  # End:
  # mkinstalldirs ends here
--- 107,111 ----
  # Local Variables:
  # mode: shell-script
! # sh-indentation: 2
  # End:
  # mkinstalldirs ends here

--- NEW FILE: config.rpath ---
#! /bin/sh
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
#   Copyright 1996-2003 Free Software Foundation, Inc.
#   Taken from GNU libtool, 2001
#   Originally by Gordon Matzigkeit <go...@gn...>, 1996
#
#   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 of the License, or
#   (at your option) any later version.
#
#   This program is distributed in the hope that it will be useful, but
#   WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
#   General Public License for more details.
#
#   You should have received a copy of the GNU General Public License
#   along with this program; if not, write to the Free Software
#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#   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.
#
# The first argument passed to this file is the canonical host specification,
#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or
#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
# should be set by the caller.
#
# The set of defined variables is at the end of this script.

# Known limitations:
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
#   than 256 bytes, otherwise the compiler driver will dump core. The only
#   known workaround is to choose shorter directory names for the build
#   directory and/or the installation directory.

# All known linkers require a `.a' archive for static linking (except M$VC,
# which needs '.lib').
libext=a
shrext=.so

host="$1"
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.

wl=
if test "$GCC" = yes; then
  wl='-Wl,'
else
  case "$host_os" in
    aix*)
      wl='-Wl,'
      ;;
    mingw* | pw32* | os2*)
      ;;
    hpux9* | hpux10* | hpux11*)
      wl='-Wl,'
      ;;
    irix5* | irix6* | nonstopux*)
      wl='-Wl,'
      ;;
    newsos6)
      ;;
    linux*)
      case $CC in
        icc|ecc)
          wl='-Wl,'
          ;;
        ccc)
          wl='-Wl,'
          ;;
      esac
      ;;
    osf3* | osf4* | osf5*)
      wl='-Wl,'
      ;;
    sco3.2v5*)
      ;;
    solaris*)
      wl='-Wl,'
      ;;
    sunos4*)
      wl='-Qoption ld '
      ;;
    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
      wl='-Wl,'
      ;;
    sysv4*MP*)
      ;;
    uts4*)
      ;;
  esac
fi

# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.

hardcode_libdir_flag_spec=
hardcode_libdir_separator=
hardcode_direct=no
hardcode_minus_L=no

case "$host_os" in
  cygwin* | mingw* | pw32*)
    # FIXME: the MSVC++ port hasn't been tested in a loooong time
    # When not using gcc, we currently assume that we are using
    # Microsoft Visual C++.
    if test "$GCC" != yes; then
      with_gnu_ld=no
    fi
    ;;
  openbsd*)
    with_gnu_ld=no
    ;;
esac

ld_shlibs=yes
if test "$with_gnu_ld" = yes; then
  case "$host_os" in
    aix3* | aix4* | aix5*)
      # On AIX/PPC, the GNU linker is very broken
      if test "$host_cpu" != ia64; then
        ld_shlibs=no
      fi
      ;;
    amigaos*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_minus_L=yes
      # Samuel A. Falvo II <kc...@do...> reports
      # that the semantics of dynamic libraries on AmigaOS, at least up
      # to version 4, is to share data among multiple programs linked
      # with the same dynamic library.  Since this doesn't match the
      # behavior of shared libraries on other platforms, we can use
      # them.
      ld_shlibs=no
      ;;
    beos*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    cygwin* | mingw* | pw32*)
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec='-L$libdir'
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    netbsd*)
      ;;
    solaris* | sysv5*)
      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
        ld_shlibs=no
      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    sunos4*)
      hardcode_direct=yes
      ;;
    *)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
  esac
  if test "$ld_shlibs" = yes; then
    # Unlike libtool, we use -rpath here, not --rpath, since the documented
    # option of GNU ld is called -rpath, not --rpath.
    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  fi
else
  case "$host_os" in
    aix3*)
      # Note: this linker hardcodes the directories in LIBPATH if there
      # are no directories specified by -L.
      hardcode_minus_L=yes
      if test "$GCC" = yes; then
        # Neither direct hardcoding nor static linking is supported with a
        # broken collect2.
        hardcode_direct=unsupported
      fi
      ;;
    aix4* | aix5*)
      if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
        aix_use_runtimelinking=no
      else
        aix_use_runtimelinking=no
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
          for ld_flag in $LDFLAGS; do
            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
              aix_use_runtimelinking=yes
              break
            fi
          done
        esac
      fi
      hardcode_direct=yes
      hardcode_libdir_separator=':'
      if test "$GCC" = yes; then
        case $host_os in aix4.[012]|aix4.[012].*)
          collect2name=`${CC} -print-prog-name=collect2`
          if test -f "$collect2name" && \
            strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
            # We have reworked collect2
            hardcode_direct=yes
          else
            # We have old collect2
            hardcode_direct=unsupported
            hardcode_minus_L=yes
            hardcode_libdir_flag_spec='-L$libdir'
            hardcode_libdir_separator=
          fi
        esac
      fi
      # Begin _LT_AC_SYS_LIBPATH_AIX.
      echo 'int main () { return 0; }' > conftest.c
      ${CC} ${LDFLAGS} conftest.c -o conftest
      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
}'`
      if test -z "$aix_libpath"; then
        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
}'`
      fi
      if test -z "$aix_libpath"; then
        aix_libpath="/usr/lib:/lib"
      fi
      rm -f conftest.c conftest
      # End _LT_AC_SYS_LIBPATH_AIX.
      if test "$aix_use_runtimelinking" = yes; then
        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
      else
        if test "$host_cpu" = ia64; then
          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
        else
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
        fi
      fi
      ;;
    amigaos*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_minus_L=yes
      # see comment about different semantics on the GNU ld section
      ld_shlibs=no
      ;;
    bsdi4*)
      ;;
    cygwin* | mingw* | pw32*)
      # When not using gcc, we currently assume that we are using
      # Microsoft Visual C++.
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec=' '
      libext=lib
      ;;
    darwin* | rhapsody*)
      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
        hardcode_direct=no
      fi
      ;;
    dgux*)
      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    freebsd1*)
      ld_shlibs=no
      ;;
    freebsd2.2*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    freebsd2*)
      hardcode_direct=yes
      hardcode_minus_L=yes
      ;;
    freebsd*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    hpux9*)
      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
      hardcode_libdir_separator=:
      hardcode_direct=yes
      # hardcode_minus_L: Not really in the search PATH,
      # but as the default location of the library.
      hardcode_minus_L=yes
      ;;
    hpux10* | hpux11*)
      if test "$with_gnu_ld" = no; then
        case "$host_cpu" in
          hppa*64*)
            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
            hardcode_libdir_separator=:
            hardcode_direct=no
            ;;
          ia64*)
            hardcode_libdir_flag_spec='-L$libdir'
            hardcode_direct=no
            # hardcode_minus_L: Not really in the search PATH,
            # but as the default location of the library.
            hardcode_minus_L=yes
            ;;
          *)
            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
            hardcode_libdir_separator=:
            hardcode_direct=yes
            # hardcode_minus_L: Not really in the search PATH,
            # but as the default location of the library.
            hardcode_minus_L=yes
            ;;
        esac
      fi
      ;;
    irix5* | irix6* | nonstopux*)
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    netbsd*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    newsos6)
      hardcode_direct=yes
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    openbsd*)
      hardcode_direct=yes
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
      else
        case "$host_os" in
          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
            hardcode_libdir_flag_spec='-R$libdir'
            ;;
          *)
            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
            ;;
        esac
      fi
      ;;
    os2*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_minus_L=yes
      ;;
    osf3*)
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    osf4* | osf5*)
      if test "$GCC" = yes; then
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      else
        # Both cc and cxx compiler support -rpath directly
        hardcode_libdir_flag_spec='-rpath $libdir'
      fi
      hardcode_libdir_separator=:
      ;;
    sco3.2v5*)
      ;;
    solaris*)
      hardcode_libdir_flag_spec='-R$libdir'
      ;;
    sunos4*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_direct=yes
      hardcode_minus_L=yes
      ;;
    sysv4)
      case $host_vendor in
        sni)
          hardcode_direct=yes # is this really true???
          ;;
        siemens)
          hardcode_direct=no
          ;;
        motorola)
          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
          ;;
      esac
      ;;
    sysv4.3*)
      ;;
    sysv4*MP*)
      if test -d /usr/nec; then
        ld_shlibs=yes
      fi
      ;;
    sysv4.2uw2*)
      hardcode_direct=yes
      hardcode_minus_L=no
      ;;
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
      ;;
    sysv5*)
      hardcode_libdir_flag_spec=
      ;;
    uts4*)
      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    *)
      ld_shlibs=no
      ;;
  esac
fi

# Check dynamic linker characteristics
# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
libname_spec='lib$name'
case "$host_os" in
  aix3*)
    ;;
  aix4* | aix5*)
    ;;
  amigaos*)
    ;;
  beos*)
    ;;
  bsdi4*)
    ;;
  cygwin* | mingw* | pw32*)
    shrext=.dll
    ;;
  darwin* | rhapsody*)
    shrext=.dylib
    ;;
  dgux*)
    ;;
  freebsd1*)
    ;;
  freebsd*)
    ;;
  gnu*)
    ;;
  hpux9* | hpux10* | hpux11*)
    case "$host_cpu" in
      ia64*)
        shrext=.so
        ;;
      hppa*64*)
        shrext=.sl
        ;;
      *)
        shrext=.sl
        ;;
    esac
    ;;
  irix5* | irix6* | nonstopux*)
    case "$host_os" in
      irix5* | nonstopux*)
        libsuff= shlibsuff=
        ;;
      *)
        case $LD in
          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
          *) libsuff= shlibsuff= ;;
        esac
        ;;
    esac
    ;;
  linux*oldld* | linux*aout* | linux*coff*)
    ;;
  linux*)
    ;;
  netbsd*)
    ;;
  newsos6)
    ;;
  nto-qnx)
    ;;
  openbsd*)
    ;;
  os2*)
    libname_spec='$name'
    shrext=.dll
    ;;
  osf3* | osf4* | osf5*)
    ;;
  sco3.2v5*)
    ;;
  solaris*)
    ;;
  sunos4*)
    ;;
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
    ;;
  sysv4*MP*)
    ;;
  uts4*)
    ;;
esac

sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF

# How to pass a linker flag through the compiler.
wl="$escaped_wl"

# Static library suffix (normally "a").
libext="$libext"

# Shared library suffix (normally "so").
shlibext="$shlibext"

# Flag to hardcode \$libdir into a binary during linking.
# This must work even if \$libdir does not exist.
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

# Whether we need a single -rpath flag with a separated argument.
hardcode_libdir_separator="$hardcode_libdir_separator"

# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
# resulting binary.
hardcode_direct="$hardcode_direct"

# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L="$hardcode_minus_L"

EOF

Index: configure
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure	1 Feb 2004 15:02:38 -0000	1.20
--- configure	29 Mar 2004 22:08:37 -0000	1.21
***************
*** 1,8 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57.
  #
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
  #! /bin/sh
[...7357 lines suppressed...]
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 6806,6813 ****
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
!          X"$as_dir" : 'X\(//\)[^/]' \| \
!          X"$as_dir" : 'X\(//\)$' \| \
!          X"$as_dir" : 'X\(/\)' \| \
!          .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 10061,10068 ----
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$as_dir" : 'X\(//\)[^/]' \| \
! 	 X"$as_dir" : 'X\(//\)$' \| \
! 	 X"$as_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

Index: configure.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.in	1 Feb 2004 15:02:38 -0000	1.19
--- configure.in	29 Mar 2004 22:08:37 -0000	1.20
***************
*** 1,3 ****
--- 1,4 ----
  dnl Process this file with autoconf to produce a configure script.
+ 
  AC_INIT(src/armdis.h)
  
***************
*** 5,41 ****
  AC_CANONICAL_TARGET
  
- VBA_USE_C_CORE=yes
- VBA_USE_MMX=no
- 
  case "$target" in
!         i?86-*-*)
!                 VBA_USE_C_CORE=no
!                 VBA_USE_MMX=yes
!                 ;;
  esac
  
! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.1)
  
  AC_ARG_ENABLE(c-core,
! [  --enable-c-core         enable C core (default is YES)],
! ac_cv_use_c_core=$enableval, ac_cv_use_c_core=$VBA_USE_C_CORE)
! AC_CACHE_CHECK(whether to enable C core, ac_cv_use_c_core, ac_cv_use_c_core=$VBA_USE_C_CORE)
  
! AC_ARG_ENABLE(dev,
! [  --enable-dev            enable development features (default is YES)],
! ac_cv_use_dev=$withval, ac_cv_use_dev=yes)
! AC_CACHE_CHECK(whether to enable development features, ac_cv_use_dev, ac_cv_use_dev=no)
  
  AC_ARG_WITH(mmx,
! [  --with-mmx              use MMX (default is NO)],
! ac_cv_use_mmx=$withval, ac_cv_use_mmx=$VBA_USE_MMX)
! AC_CACHE_CHECK(whether to use mmx, ac_cv_use_mmx, ac_cv_use_mmx=$VBA_USE_MMX)
  
! AC_ARG_WITH(profiling,
! [  --with-profiling        enable profiling (default is YES)],
! ac_cv_use_prof=$withval, ac_cv_use_prof=yes)
! AC_CACHE_CHECK(whether to enable profiling, ac_cv_use_prof, ac_cv_use_prof=yes)
  
- CCC="gcc  c++ g++ CC cxx cc++ cl"
  dnl Checks for programs.
  AC_PROG_CC
--- 6,53 ----
  AC_CANONICAL_TARGET
  
  case "$target" in
!   i?86-*-*)
!     VBA_USE_C_CORE=no
!     VBA_USE_MMX=yes
!     ;;
!   *)
!     VBA_USE_C_CORE=yes
!     VBA_USE_MMX=no
!     ;;
  esac
  
! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.2)
  
  AC_ARG_ENABLE(c-core,
!   AC_HELP_STRING([--enable-c-core],[enable C core (default is no on x86 targets)]),
!   , enable_c_core=$VBA_USE_C_CORE)
  
! AC_ARG_ENABLE(profiling,
!   AC_HELP_STRING([--enable-profiling],[enable profiling (default is yes)]),
!   , enable_profiling=yes)
  
  AC_ARG_WITH(mmx,
!   AC_HELP_STRING([--with-mmx],[use MMX (default is yes on x86 targets)]),
!   , with_mmx=$VBA_USE_MMX)
  
! AC_ARG_ENABLE(sdl,
!   AC_HELP_STRING([--enable-sdl],[build the SDL frontend (default is yes)]),
!   , enable_sdl=yes)
! 
! AC_ARG_ENABLE(gtk,
!   AC_HELP_STRING([--enable-gtk],[build the GTK+ frontend (default is no)]),
!   , enable_gtk=no)
! 
! AC_ARG_ENABLE(dev,
!   AC_HELP_STRING([--enable-dev],[enable development features (default is yes)]),
!   , enable_dev=yes)
! 
! dnl Internationalisation support.
! ALL_LINGUAS="fr"
! AM_GNU_GETTEXT(external)
! 
! GETTEXT_PACKAGE=vba-1.7.2
! AC_SUBST(GETTEXT_PACKAGE)
  
  dnl Checks for programs.
  AC_PROG_CC
***************
*** 44,63 ****
  AC_PROG_CXX
  AC_PROG_RANLIB
! AC_CHECK_TOOL(NASM, nasm)
! 
! dnl Check for SDL
! SDL_VERSION=1.2.2
! AM_PATH_SDL($SDL_VERSION,
!             :,
! 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
! )
! CFLAGS="$CFLAGS $SDL_CFLAGS"
! CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
! LIBS="$LIBS $SDL_LIBS"
  
  dnl Checks for libraries.
! AC_CHECK_LIB(png, png_create_write_struct,,AC_MSG_ERROR(Cannot compile without libpng),[-lz])
  AC_CHECK_LIB(pthread, pthread_yield)
- AC_CHECK_LIB(z, gzopen,,AC_MSG_ERROR(Cannot compile without libz))
  
  dnl Checks for header files.
--- 56,67 ----
  AC_PROG_CXX
  AC_PROG_RANLIB
! AC_PATH_PROG(NASM, nasm)
  
  dnl Checks for libraries.
! AC_CHECK_LIB(z, gzopen,
!   , AC_MSG_ERROR([*** Cannot compile without zlib.]))
! AC_CHECK_LIB(png, png_create_write_struct,
!   , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz])
  AC_CHECK_LIB(pthread, pthread_yield)
  
  dnl Checks for header files.
***************
*** 66,72 ****
  AC_CHECK_HEADERS(malloc.h strings.h unistd.h arpa/inet.h netinet/in.h zutil.h)
  
- dnl Checks for Program
- AC_PATH_PROG(NASM,nasm,no)
- 
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
--- 70,73 ----
***************
*** 75,118 ****
  AC_STRUCT_TM
  AC_MSG_CHECKING(for socklen_t)
! AC_TRY_COMPILE([#include <sys/socket.h>
  socklen_t x;
! ],[],[AC_MSG_RESULT(yes)],[
! AC_TRY_COMPILE([#include <sys/socket.h>
  int accept (int, struct sockaddr *, size_t *);
! ],[],[
  AC_MSG_RESULT(size_t)
! AC_DEFINE(socklen_t,size_t)], [
  AC_MSG_RESULT(int)
! AC_DEFINE(socklen_t,int)])])
  
  AC_C_BIGENDIAN
  
! CXXFLAGS="$CXXFLAGS -DSDL -DBKPT_SUPPORT -fno-exceptions"
  
! if test "${ac_cv_use_c_core}" = "yes"; then
    CXXFLAGS="$CXXFLAGS -DC_CORE"
  fi
  
! if test "${ac_cv_use_mmx}" = "yes"; then
    CXXFLAGS="$CXXFLAGS -DMMX"
-   VBA_MMX=i386/lib386.a
    VBA_EXTRA="$VBA_EXTRA i386"
  fi
  
! if test "${ac_cv_use_prof}" = "yes"; then
!    CXXFLAGS="$CXXFLAGS -DPROFILING"
!    VBA_EXTRA="$VBA_EXTRA prof"
  fi
  
! if test "${ac_cv_use_dev}" = "yes"; then
    CXXFLAGS="$CXXFLAGS -DDEV_VERSION"
-   VBA_PROF=prof/libprof.a
  fi
  
! dnl Checks for library functions.
  
- AC_SUBST(VBA_MMX)
  AC_SUBST(VBA_EXTRA)
! AC_SUBST(VBA_PROF)
  
! AC_OUTPUT(Makefile win32/Makefile src/Makefile src/gb/Makefile src/i386/Makefile src/prof/Makefile)
--- 76,162 ----
  AC_STRUCT_TM
  AC_MSG_CHECKING(for socklen_t)
! AC_TRY_COMPILE([
! #include <sys/socket.h>
  socklen_t x;
! ],[
! ],[
! AC_MSG_RESULT(yes)
! ],[
! AC_TRY_COMPILE([
! #include <sys/socket.h>
  int accept (int, struct sockaddr *, size_t *);
! ],[
! ],[
  AC_MSG_RESULT(size_t)
! AC_DEFINE(socklen_t,size_t)
! ],[
  AC_MSG_RESULT(int)
! AC_DEFINE(socklen_t,int)
! ])
! ])
  
  AC_C_BIGENDIAN
  
! VBA_LIBS="../gb/libgb.a"
  
! if test "x$enable_c_core" = xyes; then
    CXXFLAGS="$CXXFLAGS -DC_CORE"
  fi
  
! if test "x$enable_profiling" = xyes; then
!   CXXFLAGS="$CXXFLAGS -DPROFILING"
!   VBA_EXTRA="$VBA_EXTRA prof"
!   VBA_LIBS="$VBA_LIBS ../prof/libprof.a"
! fi
! 
! if test "x$with_mmx" = xyes; then
!   if test "x$NASM" = x; then
!     AC_MSG_ERROR([*** Couldn't find nasm program.])
!   fi
    CXXFLAGS="$CXXFLAGS -DMMX"
    VBA_EXTRA="$VBA_EXTRA i386"
+   VBA_LIBS="$VBA_LIBS ../i386/lib386.a"
  fi
  
! if test "x$enable_sdl" = xyes || test "x$enable_gtk" = xyes; then
!   SDL_VERSION=1.2.2
!   AM_PATH_SDL($SDL_VERSION,[
!   ],[
!   AC_MSG_ERROR([*** Couldn't find SDL library (version >= $SDL_VERSION).])
!   ])
!   VBA_EXTRA="$VBA_EXTRA sdl"
  fi
  
! if test "x$enable_gtk" = xyes; then
!   AC_CHECK_HEADERS(libintl.h)
!   PKG_CHECK_MODULES(GTKMM, gtkmm-2.0 libglademm-2.0 >= 2.1.0)
!   AC_SUBST(GTKMM_CFLAGS)
!   AC_SUBST(GTKMM_LIBS)
!   VBA_EXTRA="$VBA_EXTRA gtk"
! fi
! 
! if test "x$enable_dev" = xyes; then
    CXXFLAGS="$CXXFLAGS -DDEV_VERSION"
  fi
  
! if test "x$enable_sdl" != xyes && test "x$enable_gtk" != xyes; then
!   AC_MSG_WARN([*** You have chosen not to build any frontend.])
! fi
  
  AC_SUBST(VBA_EXTRA)
! AC_SUBST(VBA_LIBS)
  
! dnl Generated files.
! AC_CONFIG_FILES([
! Makefile
! m4/Makefile
! po/Makefile.in
! src/Makefile
! src/gb/Makefile
! src/gtk/Makefile
! src/i386/Makefile
! src/prof/Makefile
! src/sdl/Makefile
! win32/Makefile
! ])
! AC_OUTPUT

Index: Makefile.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.in	1 Feb 2004 15:02:38 -0000	1.10
--- Makefile.in	29 Mar 2004 22:08:37 -0000	1.11
***************
*** 1,3 ****
! # Makefile.in generated by automake 1.7.8 from Makefile.am.
  # @configure_input@
  
--- 1,3 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
***************
*** 61,76 ****
--- 61,88 ----
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GMSGFMT = @GMSGFMT@
+ GTKMM_CFLAGS = @GTKMM_CFLAGS@
+ GTKMM_LIBS = @GTKMM_LIBS@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INTLLIBS = @INTLLIBS@
  LDFLAGS = @LDFLAGS@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
  LTLIBOBJS = @LTLIBOBJS@
  MAKEINFO = @MAKEINFO@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGMERGE = @MSGMERGE@
  NASM = @NASM@
  OBJEXT = @OBJEXT@
***************
*** 82,85 ****
--- 94,99 ----
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ POSUB = @POSUB@
  RANLIB = @RANLIB@
  SDL_CFLAGS = @SDL_CFLAGS@
***************
*** 89,100 ****
  SHELL = @SHELL@
  STRIP = @STRIP@
  VBA_EXTRA = @VBA_EXTRA@
! VBA_MMX = @VBA_MMX@
! VBA_PROF = @VBA_PROF@
  VERSION = @VERSION@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
- ac_ct_NASM = @ac_ct_NASM@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
--- 103,114 ----
  SHELL = @SHELL@
  STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
  VBA_EXTRA = @VBA_EXTRA@
! VBA_LIBS = @VBA_LIBS@
  VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
***************
*** 138,144 ****
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = gnu dist-zip
- SUBDIRS = src win32
  
! EXTRA_DIST = README-win.txt README.CVS
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- 152,161 ----
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = gnu dist-zip
  
! SUBDIRS = m4 po src win32
! 
! EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION
! 
! ACLOCAL_AMFLAGS = -I m4
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
***************
*** 152,159 ****
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
! 	COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \
! 	aclocal.m4 config.guess config.sub configure configure.in \
! 	depcomp install-sh missing mkinstalldirs
  DIST_SUBDIRS = $(SUBDIRS)
  all: all-recursive
--- 169,177 ----
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
! 	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \
! 	acinclude.m4 aclocal.m4 compile config.guess config.rpath \
! 	config.sub configure configure.in depcomp install-sh missing \
! 	mkinstalldirs
  DIST_SUBDIRS = $(SUBDIRS)
  all: all-recursive
***************
*** 174,178 ****
  	cd $(srcdir) && $(AUTOCONF)
  
! $(ACLOCAL_M4):  configure.in acinclude.m4
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  uninstall-info-am:
--- 192,196 ----
  	cd $(srcdir) && $(AUTOCONF)
  
! $(ACLOCAL_M4):  configure.in acinclude.m4 m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  uninstall-info-am:
***************
*** 318,321 ****
--- 336,340 ----
  	$(am__remove_distdir)
  	mkdir $(distdir)
+ 	$(mkinstalldirs) $(distdir)/po
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
***************
*** 450,454 ****
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! 	  INSTALL_STRIP_FLAG=-s \
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 469,473 ----
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

--- NEW FILE: compile ---
#! /bin/sh

# Wrapper for compilers which do not understand `-c -o'.

# Copyright 1999, 2000 Free Software Foundation, Inc.
# Written by Tom Tromey <tr...@cy...>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

# 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.

# Usage:
# compile PROGRAM [ARGS]...
# `-o FOO.o' is removed from the args passed to the actual compile.

# Usage statement added by Billy Biggs <ve...@du...>.
if [ -z $1 ]; then
    echo "Wrapper for compilers which do not understand '-c -o'."
    echo "usage: compile PROGRAM [ARGS]..."
    echo "'-o FOO.o' is removed from the args passed to the actual compile."
    exit 1
fi

prog=$1
shift

ofile=
cfile=
args=
while test $# -gt 0; do
   case "$1" in
    -o)
       # configure might choose to run compile as `compile cc -o foo foo.c'.
       # So we do something ugly here.
       ofile=$2
       shift
       case "$ofile" in
	*.o | *.obj)
	   ;;
	*)
	   args="$args -o $ofile"
	   ofile=
	   ;;
       esac
       ;;
    *.c)
       cfile=$1
       args="$args $1"
       ;;
    *)
       args="$args $1"
       ;;
   esac
   shift
done

if test -z "$ofile" || test -z "$cfile"; then
   # If no `-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
   # `.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$prog" $args
fi

# Name of file we expect compiler to create.
cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`

# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file.  Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
while true; do
   if mkdir $lockdir > /dev/null 2>&1; then
      break
   fi
   sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir $lockdir; exit 1" 1 2 15

# Run the compile.
"$prog" $args
status=$?

if test -f "$cofile"; then
   mv "$cofile" "$ofile"
fi

rmdir $lockdir
exit $status

--- NEW FILE: VERSION ---
VisualBoyAdvance 1.7.2

Index: AUTHORS
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AUTHORS	12 Apr 2003 13:37:32 -0000	1.2
--- AUTHORS	29 Mar 2004 22:08:37 -0000	1.3
***************
*** 6,8 ****
  
  - Costis (co...@gb...): object mosaic, GP32
! - KVA: ARM/THUMB disassembler
\ No newline at end of file
--- 6,9 ----
  
  - Costis (co...@gb...): object mosaic, GP32
! - KVA: ARM/THUMB disassembler
! - kxu: GTK+ frontend

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aclocal.m4	21 Nov 2003 21:53:41 -0000	1.3
--- aclocal.m4	29 Mar 2004 22:08:37 -0000	1.4
***************
*** 1,3 ****
! # generated automatically by aclocal 1.7.8 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
--- 1,3 ----
! # generated automatically by aclocal 1.7.9 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
***************
*** 945,949 ****
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
[...2690 lines suppressed...]
+             ifelse([$4], ,echo $$1_PKG_ERRORS,)
+         fi
+ 
+         AC_SUBST($1_CFLAGS)
+         AC_SUBST($1_LIBS)
+      else
+         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+         echo "*** See http://www.freedesktop.org/software/pkgconfig"
+      fi
+   fi
+ 
+   if test $succeeded = yes; then
+      ifelse([$3], , :, [$3])
+   else
+      ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+   fi
+ ])
+ 
+ 
+ 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	1 Feb 2004 15:02:38 -0000	1.7
--- Makefile.am	29 Mar 2004 22:08:37 -0000	1.8
***************
*** 1,5 ****
  AUTOMAKE_OPTIONS = gnu dist-zip
- SUBDIRS = src win32
  
! EXTRA_DIST = README-win.txt README.CVS
  
--- 1,7 ----
  AUTOMAKE_OPTIONS = gnu dist-zip
  
! SUBDIRS = m4 po src win32
  
+ EXTRA_DIST = config.rpath README-win.txt README.CVS VERSION
+ 
+ ACLOCAL_AMFLAGS = -I m4