[Adonthell-commits] CVS: adonthell INSTALL,1.27,1.28 configure.in,1.85,1.86

[Kai Sterker <address@hidden>]

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

Modified Files:
        INSTALL configure.in 
Log Message:
ADDED non-unix-install feature
FIXES for MacOS X (official binary release coming soon!)


Index: INSTALL
===================================================================
RCS file: /cvsroot/adonthell/adonthell/INSTALL,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** INSTALL     15 Dec 2002 17:23:29 -0000      1.27
--- INSTALL     20 Feb 2003 17:27:41 -0000      1.28
***************
*** 162,168 ****
  --disable-gtktest
  
!   If configure claims to not find the SDL library, OggVorbis or
  GTK+ although they are there, or if you try to cross-compile, 
! you can disable the test. 
  
  Another way to workaround such a problem might be to recreate 
--- 162,168 ----
  --disable-gtktest
  
!   If configure claims to not find the SDL library, Ogg Vorbis or
  GTK+ although they are there, or if you try to cross-compile, 
! you can disable the respective test. 
  
  Another way to workaround such a problem might be to recreate 

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** configure.in        17 Feb 2003 19:31:21 -0000      1.85
--- configure.in        20 Feb 2003 17:27:41 -0000      1.86
***************
*** 40,43 ****
--- 40,46 ----
  dnl ********************
  
+ AC_ARG_ENABLE(unix-install,
+ [  --disable-unix-install Disable a Unix-like install (enabled by default)],
+       unixinst=$enableval, unixinst=yes)
  AC_ARG_ENABLE(tools,
  [  --enable-tools         Build the Adonthell dev tools (disabled by 
default)],
***************
*** 50,54 ****
        builddoc=$enableval, builddoc=no)
  AC_ARG_ENABLE(py-debug,
! [  --disable-py-debug      Disable debugging of Python scripts (enabled by 
default)],
        pydebug=$enableval, pydebug=yes)
  AC_ARG_WITH(ogg,
--- 53,57 ----
        builddoc=$enableval, builddoc=no)
  AC_ARG_ENABLE(py-debug,
! [  --disable-py-debug     Disable debugging of Python scripts (enabled by 
default)],
        pydebug=$enableval, pydebug=yes)
  AC_ARG_WITH(ogg,
***************
*** 71,87 ****
  
  if test x$gamedatadir = xnone; then
!   case "$target" in
!     *-*-cygwin* | *-*-mingw32*)
!       gamedatadir=""
!     ;;
!     *-*-beos*)
!       gamedatadir="/boot/home/config/share/adonthell"
!       DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
!     ;;
!     *)
!       gamedatadir="${datadir}/adonthell"
!       DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
!     ;;
!   esac
  else
    DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
--- 74,96 ----
  
  if test x$gamedatadir = xnone; then
!   if test x$unixinst = xno; then
!     gamedatadir=""
!     DEFS="$DEFS -DSINGLE_DIR_INST"
!   else
!     case "$target" in
!       *-*-cygwin* | *-*-mingw32*)
!         gamedatadir=""
!         DEFS="$DEFS -DSINGLE_DIR_INST"
!       ;;
!       *-*-beos*)
!         gamedatadir="/boot/home/config/share/adonthell"
!         DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
!       ;;
!       *)
!         gamedatadir="${datadir}/adonthell"
!         DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
!       ;;
!     esac
!   fi
  else
    DEFS="$DEFS -DDATA_DIR=\"\\\"$gamedatadir\\\"\""
***************
*** 445,456 ****
  echo "Test for Memory Leaks ..... : enabled"
  fi
! case "$target" in
!   *-*-cygwin* | *-*-mingw32*)
!     echo "Building for Windows target."
!   ;;
!   *)
      echo "Data directory ............ : $gamedatadir"
!   ;;
! esac
  
  echo
--- 454,462 ----
  echo "Test for Memory Leaks ..... : enabled"
  fi
! if text x$unixinst = xyes; then
!     echo "Single Directory install"
! else
      echo "Data directory ............ : $gamedatadir"
! fi
  
  echo