[Nel] Patches for GNU/Linux compilation

[Loic Dachary]

        Hi,

        I'm uploading a new set of Debian packages to
http://people.debian.org/~loic/debian/. Here is the list
of problems fixed in the patches attached at the end of this
mail. 

        . Missing include in snowballs client
        . Missing sources in various Makefile.am (make dist does
          not generate a proper tarbal)
        . Move AM_PATH_CCACHE later on the configure.in because
          tests on Xgcc failed
        . Re-organize SUBDIRS and DIST_SUBDIRS in Makefile.am to
          avoid duplicate traversal and include georges + ligo
        . Add minimal Makefile.am for ligo subdirectory
        . Add maintainer mode to configure.in to ease maintainance
          of autoconf files

        These patches exclusively relate to compilation for GNU/Linux.
I'd be grateful if you can apply them, using the method described by
Vincent Caron.

        Cheers,

--- snowballs.orig/client/src/animation.cpp
+++ snowballs/client/src/animation.cpp
@@ -34,6 +34,7 @@
 #include <nel/misc/command.h>
 #include <nel/misc/log.h>
 #include <nel/misc/displayer.h>
+#include <nel/misc/aabbox.h>
 
 #include "nel/3d/u_scene.h"
 #include "nel/3d/u_skeleton.h"
--- nel.orig/configure.in       13 May 2002 15:44:57 -0000      1.71
+++ nel/configure.in    13 Aug 2002 18:45:40 -0000
@@ -49,6 +49,7 @@
 CFLAGS="$CFLAGS -ftemplate-depth-24"
 CXXFLAGS="$CXXFLAGS -ftemplate-depth-24"
 
+AM_MAINTAINER_MODE
 
 dnl ====================================================================
 dnl Checks NeL modules (net, 3d, ai) to install / Disable
@@ -154,9 +155,6 @@
 
 AC_PROG_INSTALL
 
-AM_PATH_CCACHE
-
-
 dnl ====================================================================
 dnl Configure Settings
 dnl ====================================================================
@@ -207,6 +205,7 @@
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
 fi
 
+AM_PATH_CCACHE
 
 dnl ====================================================================
 dnl Checks for header files.
@@ -317,6 +316,7 @@
 AC_OUTPUT( Makefile                                        \
            include/Makefile                                \
            include/nel/Makefile                            \
+           include/nel/ligo/Makefile                       \
            include/nel/misc/Makefile                       \
            include/nel/net/Makefile                        \
            include/nel/3d/Makefile                         \
--- nel.orig/include/nel/ligo/Makefile.am
+++ nel/include/nel/ligo/Makefile.am
@@ -0,0 +1,10 @@
+#
+# $Id: Makefile.am,v 1.3 2002/03/19 17:42:48 valignat Exp $
+#
+
+MAINTAINERCLEANFILES = Makefile.in
+
+include_HEADERS      = $(wildcard *.h)
+
+# End of Makefile.am
+
--- nel.orig/include/nel/Makefile.am    19 Mar 2002 17:42:48 -0000      1.3
+++ nel/include/nel/Makefile.am 13 Aug 2002 18:45:41 -0000
@@ -4,7 +4,9 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS              = 3d ai misc net pacs sound
+DIST_SUBDIRS        = net 3d pacs sound ai misc georges ligo
+
+SUBDIRS              = ligo @NEL_SUBDIRS@
 
 includedir           = ${prefix}/include/nel
 
--- nel.orig/src/Makefile.am    19 Mar 2002 17:42:48 -0000      1.7
+++ nel/src/Makefile.am 13 Aug 2002 18:45:47 -0000
@@ -4,7 +4,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-DIST_SUBDIRS        = net 3d pacs sound ai misc
+DIST_SUBDIRS        = net 3d pacs sound ai misc georges
 
 SUBDIRS              = @NEL_SUBDIRS@
 
--- nel.orig/src/3d/Makefile.am 9 Aug 2002 09:35:51 -0000       1.85
+++ nel/src/3d/Makefile.am      13 Aug 2002 18:45:47 -0000
@@ -210,6 +210,7 @@
                        mrm_internal.cpp \
                        mrm_internal.h \
                        mrm_level_detail.cpp \
+                       mrm_level_detail.h \
                        mrm_mesh.cpp \
                        mrm_mesh.h \
                        mrm_parameters.cpp \
@@ -375,6 +376,8 @@
                        shape_bank_user.h \
                        shape.cpp \
                        shape.h \
+                       shifted_triangle_cache.cpp \
+                       shifted_triangle_cache.h \
                        skeleton_model.cpp \
                        skeleton_model.h \
                        skeleton_shape.cpp \
--- nel.orig/src/sound/Makefile.am      19 Mar 2002 17:42:48 -0000      1.5
+++ nel/src/sound/Makefile.am   13 Aug 2002 18:45:49 -0000
@@ -12,6 +12,8 @@
                        ambiant_source.h                    \
                        audio_mixer_user.cpp                \
                        audio_mixer_user.h                  \
+                       background_sound_manager.cpp        \
+                       background_sound_manager.h          \
                        bounding_box.cpp                    \
                        bounding_box.h                      \
                        bounding_shape.h                    \
@@ -26,8 +28,12 @@
                        mixing_track.cpp                    \
                        mixing_track.h                      \
                        playable.h                          \
+                       sample_bank.cpp                     \
+                       sample_bank.h                       \
                        sound.cpp                           \
                        sound.h                             \
+                       sound_bank.cpp                      \
+                       sound_bank.h                        \
                        source_user.cpp                     \
                        source_user.h
 
-- 
Loic   Dachary         http://www.dachary.org/  address@hidden
12 bd  Magenta         http://www.senga.org/      address@hidden
75010    Paris         T: 33 1 42 45 07 97          address@hidden
        GPG Public Key: http://www.dachary.org/loic/gpg.txt