[Nel] GNU/Linux patch

[Loic Dachary]

        Hi,

        The attached patch fixes the following:

        - bootstrap command ordering
        - vegetable_light_ex.cpp (that one is not willing to go thru
          apparently)
        - add --with-logdir, --with-sysconfdir and --with-localstatedir
          options to control the location of the log files, configuration
          files and state database for nelns and snowballs
        - prevent overriding already installed configuration file

        Cheers,

Index: nel/bootstrap
===================================================================
RCS file: /home/cvsroot/code/nel/bootstrap,v
retrieving revision 1.3
diff -u -r1.3 bootstrap
--- nel/bootstrap       29 Jun 2001 14:40:58 -0000      1.3
+++ nel/bootstrap       9 Apr 2002 15:39:13 -0000
@@ -11,8 +11,8 @@
        touch ChangeLog
 fi
 
-aclocal \
-&& libtoolize --force --copy \
+libtoolize --force --copy \
+&& aclocal \
 && autoheader \
 && automake --gnu --add-missing --copy \
 && autoconf
Index: nel/src/3d/vegetable_light_ex.cpp
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/vegetable_light_ex.cpp,v
retrieving revision 1.2
diff -u -r1.2 vegetable_light_ex.cpp
--- nel/src/3d/vegetable_light_ex.cpp   15 Mar 2002 16:10:44 -0000      1.2
+++ nel/src/3d/vegetable_light_ex.cpp   9 Apr 2002 15:39:19 -0000
@@ -42,7 +42,8 @@
                // get the attenuation
                uint    att= PointLightFactor[i];
                // modulate the color with it.
-               Color[i].modulateFromui(pl->getDiffuse(), att);
+               NLMISC::CRGBA diffuse = pl->getDiffuse();
+               Color[i].modulateFromui(diffuse, att);
        }
 }
 
Index: nelns/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- nelns/Makefile.am   19 Mar 2002 17:42:48 -0000      1.6
+++ nelns/Makefile.am   9 Apr 2002 15:39:37 -0000
@@ -17,5 +17,23 @@
 dist-hook:
        find $(distdir) -name CVS -print | xargs rm -fr
 
+install-data-hook:
+       mkdir -p ${DESTDIR}${pkglocalstatedir}
+       mkdir -p ${DESTDIR}${logdir}
+       mkdir -p ${DESTDIR}${pkgsysconfdir}
+#
+# Do not override existing config files
+#
+       for service in admin admin_executor login naming welcome ; \
+       do \
+               test -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg || 
cp ${srcdir}/$${service}_service/$${service}_service.cfg 
${DESTDIR}${pkgsysconfdir} ; \
+       done
+
+uninstall-local:
+       for service in admin admin_executor login naming welcome ; \
+       do \
+               rm -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg ; \
+       done
+
 # End of Makefile.am
 
Index: nelns/configure.in
===================================================================
RCS file: /home/cvsroot/code/nelns/configure.in,v
retrieving revision 1.12
diff -u -r1.12 configure.in
--- nelns/configure.in  21 Mar 2002 10:54:37 -0000      1.12
+++ nelns/configure.in  9 Apr 2002 15:39:37 -0000
@@ -102,16 +102,36 @@
 dnl nelns configuration and logs file location
 dnl ====================================================================
 
-pkgsysconfdir='${sysconfdir}/nelns'
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+
+AC_ARG_WITH(sysconfdir,
+    [  --with-sysconfdir[=DIR]
+                          use DIR instead of the default sysconfdir/nelns],
+    [pkgsysconfdir=$withval],
+    [pkgsysconfdir='${sysconfdir}/nelns'])
 AC_SUBST(pkgsysconfdir)
 
-eval NELNS_STATE=\"$localstatedir/games/nelns/\"
+eval eval NELNS_CONFIG=\"$pkgsysconfdir/\"
+AC_DEFINE_UNQUOTED(NELNS_CONFIG, "$NELNS_CONFIG")
+
+AC_ARG_WITH(localstatedir,
+    [  --with-localstatedir[=DIR]
+                          use DIR instead of the default 
localstatedir/game/nelns],
+    [pkglocalstatedir=$withval],
+    [pkglocalstatedir=${localstatedir}/game/nelns])
+AC_SUBST(pkglocalstatedir)
+
+eval eval NELNS_STATE=\"$pkglocalstatedir/\"
 AC_DEFINE_UNQUOTED(NELNS_STATE, "$NELNS_STATE")
 
-eval NELNS_CONFIG=\"$sysconfdir/nelns/\"
-AC_DEFINE_UNQUOTED(NELNS_CONFIG, "$NELNS_CONFIG")
+AC_ARG_WITH(logdir,
+    [  --with-logdir[=DIR]
+                          use DIR instead of the default 
localstatedir/log/nelns],
+    [logdir=$withval],
+    [logdir='${localstatedir}/log/nelns'])
+AC_SUBST(logdir)
 
-eval NELNS_LOGS=\"$localstatedir/log/nelns/\"
+eval eval NELNS_LOGS=\"$logdir/\"
 AC_DEFINE_UNQUOTED(NELNS_LOGS, "$NELNS_LOGS")
 
 dnl ====================================================================
Index: nelns/admin_executor_service/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/admin_executor_service/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- nelns/admin_executor_service/Makefile.am    19 Mar 2002 17:42:48 -0000      
1.5
+++ nelns/admin_executor_service/Makefile.am    9 Apr 2002 15:39:37 -0000
@@ -11,7 +11,5 @@
 
 admin_executor_service_SOURCES = admin_executor_service.cpp
 
-pkgsysconf_DATA                       = admin_executor_service.cfg
-
 # End of Makefile.am
 
Index: nelns/admin_service/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/admin_service/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- nelns/admin_service/Makefile.am     19 Mar 2002 17:42:48 -0000      1.4
+++ nelns/admin_service/Makefile.am     9 Apr 2002 15:39:37 -0000
@@ -11,7 +11,5 @@
 
 admin_service_SOURCES = admin_service.cpp
 
-pkgsysconf_DATA              = admin_service.cfg
-
 # End of Makefile.am
 
Index: nelns/login_service/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/login_service/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- nelns/login_service/Makefile.am     19 Mar 2002 17:42:49 -0000      1.5
+++ nelns/login_service/Makefile.am     9 Apr 2002 15:39:38 -0000
@@ -16,7 +16,5 @@
                         login_service.cpp                  \
                         login_service.h
 
-pkgsysconf_DATA              = login_service.cfg
-
 # End of Makefile.am
 
Index: nelns/naming_service/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/naming_service/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- nelns/naming_service/Makefile.am    19 Mar 2002 17:42:49 -0000      1.3
+++ nelns/naming_service/Makefile.am    9 Apr 2002 15:39:38 -0000
@@ -11,6 +11,4 @@
 
 naming_service_SOURCES = naming_service.cpp
 
-pkgsysconf_DATA        = naming_service.cfg
-
 # End of Makefile.am
Index: nelns/welcome_service/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nelns/welcome_service/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- nelns/welcome_service/Makefile.am   19 Mar 2002 17:42:49 -0000      1.4
+++ nelns/welcome_service/Makefile.am   9 Apr 2002 15:39:38 -0000
@@ -11,6 +11,4 @@
 
 welcome_service_SOURCES = welcome_service.cpp
 
-pkgsysconf_DATA                = welcome_service.cfg
-
 # End of Makefile.am
Index: snowballs2/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/snowballs2/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- snowballs2/Makefile.am      19 Mar 2002 17:42:49 -0000      1.3
+++ snowballs2/Makefile.am      9 Apr 2002 15:39:39 -0000
@@ -13,4 +13,23 @@
 
 SUBDIRS              = @SNO_SUBDIRS@
 
+install-data-hook:
+       mkdir -p ${DESTDIR}${logdir}
+       mkdir -p ${DESTDIR}${pkgsysconfdir}
+#
+# Do not override existing config file
+#
+       test -f ${DESTDIR}${pkgsysconfdir}/client.cfg || cp client/client.cfg 
${DESTDIR}${pkgsysconfdir}
+       for service in frontend chat position ; \
+       do \
+               test -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg || 
cp ${srcdir}/server/$${service}/$${service}_service.cfg 
${DESTDIR}${pkgsysconfdir} ; \
+       done
+
+uninstall-local:
+       rm -f ${DESTDIR}${pkgsysconfdir}/client.cfg
+       for service in frontend chat position ; \
+       do \
+               rm -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg ; \
+       done
+
 # End of Makefile.am
Index: snowballs2/configure.in
===================================================================
RCS file: /home/cvsroot/code/snowballs2/configure.in,v
retrieving revision 1.12
diff -u -r1.12 configure.in
--- snowballs2/configure.in     21 Mar 2002 10:54:37 -0000      1.12
+++ snowballs2/configure.in     9 Apr 2002 15:39:39 -0000
@@ -150,18 +150,34 @@
 dnl Snowballs data, configuration and logs file location
 dnl ====================================================================
 
-eval SNOWBALLS_DATABASE=\"$datadir/games/snowballs/\"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+
+AC_ARG_WITH(database,
+    [  --with-database[=DIR]
+                          use DIR instead of the default 
datadir/games/snowballs],
+    [database=$withval],
+    [database='${datadir}/games/snowballs'])
+eval eval SNOWBALLS_DATABASE=\"$database/\"
 AC_SUBST(SNOWBALLS_DATABASE)
 
-pkgsysconfdir='${sysconfdir}/snowballs'
+AC_ARG_WITH(sysconfdir,
+    [  --with-sysconfdir[=DIR]
+                          use DIR instead of the default sysconfdir/snowballs],
+    [pkgsysconfdir=$withval],
+    [pkgsysconfdir='${sysconfdir}/snowballs'])
 AC_SUBST(pkgsysconfdir)
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
-eval SNOWBALLS_CONFIG=\"$sysconfdir/snowballs/\"
+eval eval SNOWBALLS_CONFIG=\"$pkgsysconfdir/\"
 AC_DEFINE_UNQUOTED(SNOWBALLS_CONFIG, "$SNOWBALLS_CONFIG")
 
-eval SNOWBALLS_LOGS=\"$localstatedir/log/snowballs/\"
+AC_ARG_WITH(logdir,
+    [  --with-logdir[=DIR]
+                          use DIR instead of the default 
localstatedir/log/snowballs],
+    [logdir=$withval],
+    [logdir='${localstatedir}/log/snowballs'])
+AC_SUBST(logdir)
+
+eval eval SNOWBALLS_LOGS=\"$logdir/\"
 AC_DEFINE_UNQUOTED(SNOWBALLS_LOGS, "$SNOWBALLS_LOGS")
 
 dnl ====================================================================
Index: snowballs2/client/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/snowballs2/client/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- snowballs2/client/Makefile.am       19 Mar 2002 17:42:49 -0000      1.2
+++ snowballs2/client/Makefile.am       9 Apr 2002 15:39:39 -0000
@@ -7,7 +7,5 @@
 EXTRA_DIST          = client.cfg.in \
                       client.dsp
 
-pkgsysconf_DATA             = client.cfg
-
 # End of Makefile.am
 
Index: snowballs2/client/client.cfg
===================================================================
RCS file: /home/cvsroot/code/snowballs2/client/client.cfg,v
retrieving revision 1.31
diff -u -r1.31 client.cfg
--- snowballs2/client/client.cfg        25 Mar 2002 10:16:32 -0000      1.31
+++ snowballs2/client/client.cfg        9 Apr 2002 15:39:39 -0000
@@ -13,7 +13,7 @@
 FontName = "n019003l.pfb";
 
 // Root directory where we can find the client datas (zones, tiles, maps, ...)
-DataPath = "data/";
+DataPath = "/tmp/local/share/games/snowballs/";
 
 //////////////////////////////////////////////////////////////////////////////
 // Screen Variables //////////////////////////////////////////////////////////
@@ -143,9 +143,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // Address of the login system (should be itsalive.nevrax.org)
-LoginSystemAddress = "localhost";
-//LoginSystemAddress = "itsalive.nevrax.org";
-//LoginSystemAddress = "loic.dachary.org";
+LoginSystemAddress = "itsalive.nevrax.org";
 
 // Your login
 Login = "";
Index: snowballs2/server/chat/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/snowballs2/server/chat/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- snowballs2/server/chat/Makefile.am  19 Mar 2002 17:42:49 -0000      1.2
+++ snowballs2/server/chat/Makefile.am  9 Apr 2002 15:39:39 -0000
@@ -8,7 +8,5 @@
 
 EXTRA_DIST          = chat_service.cfg
 
-pkgsysconf_DATA             = chat_service.cfg
-
 # End of Makefile.am
 
Index: snowballs2/server/frontend/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/snowballs2/server/frontend/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- snowballs2/server/frontend/Makefile.am      19 Mar 2002 17:42:49 -0000      
1.2
+++ snowballs2/server/frontend/Makefile.am      9 Apr 2002 15:39:40 -0000
@@ -8,7 +8,5 @@
 
 EXTRA_DIST          = frontend_service.cfg
 
-pkgsysconf_DATA             = frontend_service.cfg
-
 # End of Makefile.am
 
Index: snowballs2/server/position/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/snowballs2/server/position/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- snowballs2/server/position/Makefile.am      19 Mar 2002 17:42:49 -0000      
1.2
+++ snowballs2/server/position/Makefile.am      9 Apr 2002 15:39:40 -0000
@@ -8,7 +8,5 @@
 
 EXTRA_DIST          = position_service.cfg
 
-pkgsysconf_DATA             = position_service.cfg
-
 # End of Makefile.am

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