Fixed --disable-scripting build

* Fixed some unprefixed cstdlib calls (hidden by libguile.h including stdlib.h)
* Fixed unincluded sys/types.h (also hidden by libguile.h including this)
* make install attempted to create /bobotpp directory when
  @GUILE_SITE@ was unset; now script installation is conditional on
  scripting being enabled as it ought to be

diff --git a/configure.ac b/configure.ac
index 52ef559..3fbe722 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,17 +24,20 @@ AC_ARG_ENABLE(scripting,
   else 
     GUILE_PROGS
     GUILE_FLAGS
+    GUILE_SITE_DIR
     AC_DEFINE(USESCRIPTS,1,[Do we have Guile script support?])
     AC_DEFINE(MULTITHREAD,1,[Is the bot Multithreaded?])
   fi
 ],
 [
+  enable_scripting=yes
   GUILE_PROGS
   GUILE_FLAGS
   GUILE_SITE_DIR
   AC_DEFINE(USESCRIPTS,1)
   AC_DEFINE(MULTITHREAD,1)
 ])
+AM_CONDITIONAL([SCRIPTING], [test x$enable_scripting = xyes])
 
 AC_SUBST(CXXFLAGS, "$GUILE_CFLAGS $CXXFLAGS")
 AC_SUBST(LDFLAGS, "$GUILE_LDFLAGS $LDFLAGS")

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a6d48ad..4d31c60 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,3 +1,4 @@
+if SCRIPTING
 scriptsdir = $(datadir)/bobotpp/scripts
 
 scripts_DATA = bobot-utils.scm
@@ -5,4 +6,5 @@ scripts_DATA = bobot-utils.scm
 guilesitebotdir = @GUILE_SITE@/bobotpp
 guilesitebot_DATA = bot.scm
 
-EXTRA_DIST = $(scripts_DATA) $(guilesitebot_DATA)
\ No newline at end of file
+EXTRA_DIST = $(scripts_DATA) $(guilesitebot_DATA)
+endif
\ No newline at end of file

diff --git a/source/DCCManager.H b/source/DCCManager.H
index 828a09e..86e2579 100644 (file)
--- a/source/DCCManager.H
+++ b/source/DCCManager.H
@@ -20,6 +20,10 @@
 
 #include <map>
 #include <list>
+
+#include <sys/types.h>
+#include <unistd.h>
+
 #include "DCCPerson.H"
 #include "DCCConnection.H"
 #include "UserCommands.H"

diff --git a/source/ServerQueue.C b/source/ServerQueue.C
index b701074..d0432f7 100644 (file)
--- a/source/ServerQueue.C
+++ b/source/ServerQueue.C
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-//#include <limits>
+#include <limits>
 #include "ServerQueue.H"
 #include "Utils.H"
 
@@ -35,7 +35,7 @@ ServerQueue::ServerQueue(Socket * s, bool d)
 
 ServerQueue::~ServerQueue()
 {
-  penalty = INT_MIN;
+  penalty = std::numeric_limits<int>::min ();
   flush();
 }
 

diff --git a/source/UserList.C b/source/UserList.C
index b1038d0..ef2d21f 100644 (file)
--- a/source/UserList.C
+++ b/source/UserList.C
@@ -17,6 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 
@@ -74,9 +75,9 @@ UserList::read()
          password = "";
        }
       
-      l.push_back(new UserListItem(mask, maskChannel, atoi(level),
-                                  atoi(prot), atoi(aop),
-                                  atol(expiration), password));
+      l.push_back(new UserListItem(mask, maskChannel, std::atoi(level),
+                                  std::atoi(prot), std::atoi(aop),
+                                  std::atol(expiration), password));
       line++;
     }