[Adonthell-commits] CVS: adonthell ABOUT-NLS,1.1,1.2 config.rpath,1.1,1.2 stamp-h.in,1.4,1.5 .cvsignore,1.3,1.4 Makefile.am,1.16,1.17 acinclude.m4,1.13,1.14 autogen.sh,1.5,1.6 config.log,1.7,1.8 config.status,1.9,1.10 configure.in,1.55,1.56

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell
In directory subversions:/tmp/cvs-serv32214

Modified Files:
        .cvsignore Makefile.am acinclude.m4 autogen.sh config.log 
        config.status configure.in 
Added Files:
        ABOUT-NLS config.rpath stamp-h.in 
Log Message:
PREPARED code for i18n and ttf support
CHANGED game class and initialization
ADDED new dlgedit





Index: .cvsignore
===================================================================
RCS file: /cvsroot/adonthell/adonthell/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** .cvsignore  16 Aug 2001 21:32:28 -0000      1.3
--- .cvsignore  7 Apr 2002 09:51:27 -0000       1.4
***************
*** 11,12 ****
--- 11,14 ----
  ltconfig
  ltmain.sh
+ stamp-h
+ config.h

Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Makefile.am 9 Mar 2002 21:20:33 -0000       1.16
--- Makefile.am 7 Apr 2002 09:51:27 -0000       1.17
***************
*** 1,7 ****
! SUBDIRS = src doc
! EXTRA_DIST = NEWBIE autogen.sh README.BeOS README.FreeBSD autogen.sh \
!       debian/README.debian debian/adonthell.6 debian/changelog debian/control 
\
!       debian/copyright debian/dirs debian/rules adonthell.spec.in \
!       adonthell.spec
  
  install-data-local:
--- 1,7 ----
! SUBDIRS = intl po src doc
! EXTRA_DIST = config.rpath ABOUT-NLS NEWBIE autogen.sh README.BeOS \
!         README.FreeBSD autogen.sh debian/README.debian debian/adonthell.6 \
!         debian/changelog debian/control debian/copyright debian/dirs \
!         debian/rules adonthell.spec.in adonthell.spec
  
  install-data-local:
***************
*** 9,10 ****
--- 9,11 ----
        mkdir $(gamedatadir)/games; \
        fi
+ 

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/adonthell/adonthell/acinclude.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** acinclude.m4        15 Oct 2001 12:55:23 -0000      1.13
--- acinclude.m4        7 Apr 2002 09:51:27 -0000       1.14
***************
*** 11,495 ****
  )
  
! # Configure paths for SDL
! # Sam Lantinga 9/21/99
! # stolen from Manish Singh
! # stolen back from Frank Belew
! # stolen from Manish Singh
! # Shamelessly stolen from Owen Taylor
! 
! dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
[...4170 lines suppressed...]
+   else
+     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+     LIBLTDL="-lltdl"
+     LTDLINCL=
+   fi
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
+ ])
+ 
+ # old names
+ AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+ AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+ AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+ AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])

Index: autogen.sh
===================================================================
RCS file: /cvsroot/adonthell/adonthell/autogen.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** autogen.sh  15 Oct 2001 12:55:23 -0000      1.5
--- autogen.sh  7 Apr 2002 09:51:27 -0000       1.6
***************
*** 1,7 ****
  #!/bin/sh
  # First of all clean up the generated crud
! rm -f configure config.log config.guess config.sub config.cache
  rm -f config.status aclocal.m4
  rm -f `find . -name 'Makefile.in'`
  rm -f `find . -name 'Makefile'`
  
--- 1,9 ----
  #!/bin/sh
  # First of all clean up the generated crud
! rm -f configure config.log config.cache
  rm -f config.status aclocal.m4
+ mv intl/Makefile.in intl/Makefile.bak
  rm -f `find . -name 'Makefile.in'`
+ mv intl/Makefile.bak intl/Makefile.in
  rm -f `find . -name 'Makefile'`
  
***************
*** 9,12 ****
--- 11,15 ----
  aclocal -I .
  libtoolize --force --copy
+ autoheader
  automake --add-missing --gnu
  autoconf 

Index: config.log
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** config.log  5 Aug 2000 12:47:43 -0000       1.7
--- config.log  7 Apr 2002 09:51:27 -0000       1.8
***************
*** 2,36 ****
  running configure, to aid debugging if configure makes a mistake.
  
! configure:566: checking for a BSD compatible install
! configure:619: checking whether build environment is sane
! configure:676: checking whether make sets ${MAKE}
! configure:722: checking for working aclocal
! configure:735: checking for working autoconf
! configure:748: checking for working automake
! configure:761: checking for working autoheader
! configure:774: checking for working makeinfo
[...1270 lines suppressed...]
! config.status:1114: executing default-2 commands
! 
! ## ---------------------- ##
! ## Running config.status. ##
! ## ---------------------- ##
! 
! This file was extended by adonthell config.status 0.3.3, which was
! generated by GNU Autoconf 2.53.  Invocation command line was
! 
!   CONFIG_FILES    = src/tools/dlgedit/Makefile
!   CONFIG_HEADERS  = 
!   CONFIG_LINKS    = 
!   CONFIG_COMMANDS = 
!   $ ./config.status 
! 
! on hund
! 
! config.status:690: creating src/tools/dlgedit/Makefile
! config.status:1114: executing default-1 commands
! config.status:1114: executing default-2 commands

Index: config.status
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.status,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** config.status       5 Aug 2000 12:47:43 -0000       1.9
--- config.status       7 Apr 2002 09:51:27 -0000       1.10
***************
*** 1,181 ****
  #! /bin/sh
! # Generated automatically by configure.
  # Run this file to recreate the current configuration.
- # This directory was configured as follows,
- # on host hund:
- #
- # ./configure 
- #
  # Compiler output produced by configure, useful for debugging
! # configure, is in ./config.log if it exists.
[...1472 lines suppressed...]
!             done
!           fi
!           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || 
echo "creating $ac_dir/Makefile"
!           sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r 
$ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e 
"s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e 
"s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" 
"$ac_dir/Makefile.in" > "$ac_dir/Makefile"
!           for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
!             if test -f "$f"; then
!               case "$f" in
!                 *.orig | *.bak | *~) ;;
!                 *) cat "$f" >> "$ac_dir/Makefile" ;;
!               esac
!             fi
!           done
!         fi
!         ;;
!       esac
!     done ;;
!   esac
! done
  
! { (exit 0); exit 0; }

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** configure.in        11 Mar 2002 18:28:09 -0000      1.55
--- configure.in        7 Apr 2002 09:51:27 -0000       1.56
***************
*** 3,13 ****
  dnl **************************************************************
  
! AC_INIT(README)
! AM_INIT_AUTOMAKE(adonthell, 0.3.2)
  
  CFLAGS="-g -Wall -fno-exceptions -fno-rtti"
  DEFS=""
  
  dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
--- 3,24 ----
  dnl **************************************************************
  
! AC_PREREQ(2.50)
! AC_INIT(adonthell, 0.3.3, address@hidden, adonthell)
! AC_PREFIX_PROGRAM(adonthell)
! 
! dnl Detect the canonical host and target build environment
! AC_CANONICAL_HOST
! AC_CANONICAL_TARGET
! 
! AM_INIT_AUTOMAKE(adonthell, 0.3.3)
! AM_CONFIG_HEADER(config.h)
  
  CFLAGS="-g -Wall -fno-exceptions -fno-rtti"
  DEFS=""
  
+ dnl ********************
  dnl Checks for programs.
+ dnl ********************
+ 
  AC_PROG_CC
  AC_PROG_CXX
***************
*** 16,24 ****
  AM_PROG_LIBTOOL
  AC_PROG_MAKE_SET
- dnl AC_PROG_RANLIB
  
! dnl Detect the canonical host and target build environment
! AC_CANONICAL_HOST
! AC_CANONICAL_TARGET
  
  dnl ********************
--- 27,37 ----
  AM_PROG_LIBTOOL
  AC_PROG_MAKE_SET
  
! dnl ****
! dnl i18n
! dnl ****
! 
! AM_GNU_GETTEXT
! ALL_LINGUAS=""
  
  dnl ********************
***************
*** 46,53 ****
              gamedatadir="$withval", gamedatadir=none)
  
- 
  dnl **********************
  dnl Set the data directory
  dnl **********************
  if test x$gamedatadir = xnone; then
    case "$target" in
--- 59,66 ----
              gamedatadir="$withval", gamedatadir=none)
  
  dnl **********************
  dnl Set the data directory
  dnl **********************
+ 
  if test x$gamedatadir = xnone; then
    case "$target" in
***************
*** 65,69 ****
  DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
  
- 
  dnl **********************
  dnl Check for memory leaks
--- 78,81 ----
***************
*** 84,109 ****
  AC_CHECK_LIB(z, main,,echo "Adonthell requires Zlib. Exitting...";exit 1)
  
  dnl Check for SDL
  SDL_VERSION=1.2.0
  AM_PATH_SDL($SDL_VERSION,
!             :,
!           AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
  )
  
  
! dnl********************
  dnl Check for OggVorbis
! dnl********************
  
  OGG_VORBIS=no
  AM_PATH_VORBIS(
!   OGG_VORBIS="yes"
!   ogg_music="enabled"
!   OGG_LIBS="$VORBIS_LIBS $VORBISFILE_LIBS"
!   OGG_DEFS="-DOGG_MUSIC"
!   OGG_CFLAGS="$VORBIS_CFLAGS",
!   AC_MSG_RESULT(Disabling OggVorbis support)
!   ogg_music="disabled")
! 
  
  dnl ********************
--- 96,132 ----
  AC_CHECK_LIB(z, main,,echo "Adonthell requires Zlib. Exitting...";exit 1)
  
+ dnl *************
  dnl Check for SDL
+ dnl *************
+ 
  SDL_VERSION=1.2.0
  AM_PATH_SDL($SDL_VERSION,
!     :,
!       AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
  )
  
+ dnl *******************
+ dnl Check for FreeType2
+ dnl *******************
+ 
+ AC_CHECK_FT2(6.0.0,
+     :,
+     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
+ )
  
! dnl *******************
  dnl Check for OggVorbis
! dnl *******************
  
  OGG_VORBIS=no
  AM_PATH_VORBIS(
!         OGG_VORBIS="yes"
!         ogg_music="enabled"
!         OGG_LIBS="$VORBIS_LIBS $VORBISFILE_LIBS"
!         OGG_DEFS="-DOGG_MUSIC"
!         OGG_CFLAGS="$VORBIS_CFLAGS",
!         AC_MSG_RESULT(Disabling OggVorbis support)
!         ogg_music="disabled"
! )
  
  dnl ********************
***************
*** 193,197 ****
  
  dnl only GNU ld seems to knows -E flag
! if test x$ac_cv_prog_gnu_ld = xyes ; then
      PY_LIBS="-Wl,-E $PY_LIBS $PY_DEPS"
  else
--- 216,220 ----
  
  dnl only GNU ld seems to knows -E flag
! if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
      PY_LIBS="-Wl,-E $PY_LIBS $PY_DEPS"
  else
***************
*** 210,216 ****
  
  
  dnl Check for SWIG
! AC_PATH_PROG(P_SWIG,swig)
  
  
  dnl ********************************
--- 233,277 ----
  
  
+ dnl **************
  dnl Check for SWIG
! dnl **************
! 
! haveswig=no
! 
! AC_PATH_PROG(P_SWIG,swig,no)
! if test "$P_SWIG" != "no" ; then
!     $P_SWIG -version &> swig.ver
! 
!     changequote(<<, >>)
!     swig_major_ver=`more swig.ver | sed 's/.* 
\([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'`
!     swig_minor_ver=`more swig.ver | sed 's/.* 
[0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'`
!     swig_micro_ver=`more swig.ver | sed 's/.* 
[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'`
!     changequote([, ])
  
+     rm -f swig.ver
+ 
+     SWIG_VERSION="$swig_major_ver.$swig_minor_ver.$swig_micro_ver"
+ 
+     if test $swig_major_ver -gt 1 -o \
+             $swig_major_ver -eq 1 -a $swig_minor_ver -gt 3 -o \
+             $swig_major_ver -eq 1 -a $swig_minor_ver -eq 3 -a $swig_micro_ver 
-gt 9 ;
+     then
+         haveswig=yes
+     fi
+ fi
+ 
+ dnl SWIG is needed to compile the code from CVS
+ dnl or after making changes to the distributed code
+ 
+ if test x$haveswig = xno ; then
+     if test -d "CVS"; then
+         echo "*** To compile Adonthell from CVS, you will need SWIG 1.3.10 or 
higher."
+         echo "*** You can obtain the most recent version from 
http://www.swig.org.";
+         exit 1;
+     else
+         echo "*** NOTE: If you plan to make changes to the code you will need"
+         echo "*** SWIG 1.3.10 or higher. SWIG can be found at 
http://www.swig.org.";
+     fi
+ fi
  
  dnl ********************************
***************
*** 313,317 ****
  AC_SUBST(P_SWIG)
  AC_SUBST(gamedatadir)
!   
  AC_OUTPUT([
  adonthell.spec
--- 374,380 ----
  AC_SUBST(P_SWIG)
  AC_SUBST(gamedatadir)
! AC_SUBST(FT2_LIBS)
! AC_SUBST(FT2_CFLAGS)
! 
  AC_OUTPUT([
  adonthell.spec
***************
*** 321,327 ****
--- 384,393 ----
  doc/dlgedit/Makefile
  doc/items/Makefile
+ intl/Makefile 
+ po/Makefile.in 
  src/Makefile
  src/tools/Makefile
  src/tools/charedit/Makefile
+ src/tools/combat/Makefile
  src/tools/dlgedit/Makefile
  src/tools/dlgedit/examples/Makefile
***************
*** 342,345 ****
--- 408,415 ----
  echo "Python .................... : $PY_VERSION"
  echo "Python debugging .......... : $pydebug"
+ echo "Freetype .................. : `freetype-config --version`"
+ if test x$haveswig = xyes; then
+ echo "SWIG ...................... : $SWIG_VERSION"
+ fi
  if test x$havegtk = xyes; then
  echo "GTK+ ...................... : `gtk-config --version`"