Merge branch 'stg-2.409' into stg-2.409-radius

diff --git a/projects/libs/build b/projects/libs/build
index 4c1fce9bfd129b8fefe8a5b09bb8217e7a4f9b0c..53e3b5339a57f4126908d5d2c9bea1cff751df81 100755 (executable)
--- a/projects/libs/build
+++ b/projects/libs/build
@@ -65,7 +65,7 @@ fi
 if [ "$sys" = "Darwin" ]
 then
     OS=darwin
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 995a9373a541a764239701ab6850c94f23c1e184..8c12e5279ce5af7b9ae02aeba01944bb24ddb157 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -55,7 +55,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]

diff --git a/projects/sgauth/build b/projects/sgauth/build
index 5f8821b0b803a7fd745898ae65cdfc8277e7787e..3e5833fc1eb0d455938784686e3c1430499814d2 100755 (executable)
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -55,7 +55,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
     CFLAGS="$CFLAGS -I/opt/local/include"
     CXXFLAGS="$CFLAGS -I/opt/local/include"
     LDFLAGS="$LDFLAGS -L/opt/local/lib"

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 74c09b62a08b711bde41f022edb24e9f13582fd8..4415220f1e821aa258f2f8db3e5a24cd3125fdb6 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -30,7 +30,12 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
 CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
-LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
+
+ifneq ($(OS),darwin)
+LDFLAGS += -Wl,-E
+endif
+
+LDFLAGS += $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs plugins
 all: libs plugins $(PROG) ../../Makefile.conf

diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build
index dae35b74bcec7d9d2a0fc49e8e628e1b20a37fb7..125061d92b3887e4a944ffb76a0cc0fd7c6ae7c1 100755 (executable)
--- a/projects/sgauthstress/build
+++ b/projects/sgauthstress/build
@@ -55,7 +55,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
     CFLAGS="$CFLAGS -I/opt/local/include"
     CXXFLAGS="$CFLAGS -I/opt/local/include"
     LDFLAGS="$LDFLAGS -L/opt/local/lib"
@@ -92,12 +92,18 @@ else
         DEFS="$DEFS -DFREE_BSD"
         LIB_THREAD=-lc_r
     else
-        DEFS="$DEFS -DFREE_BSD5"
         if [ "$OS" = "bsd7" ]
         then
+            DEFS="$DEFS -DFREE_BSD5"
             LIB_THREAD=-lpthread
         else
-            LIB_THREAD=-lc_r
+            if [ "$OS" == "darwin" ]
+            then
+                DEFS="$DEFS -DDARWIN"
+                LIB_THREAD=-lpthread
+            else
+                LIB_THREAD=-lc_r
+            fi
         fi
     fi
 fi

diff --git a/projects/sgconf/build b/projects/sgconf/build
index 7ac18e3c5519deeefa85518f263f2d30e948bac8..559f53c599902cdeaa0466bfb041c4f65c7ab68f 100755 (executable)
--- a/projects/sgconf/build
+++ b/projects/sgconf/build
@@ -55,7 +55,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]

diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp
index 9d340e8315f4e41780b650a8c953d30bca64e8d1..79833fd317d871a094407857660dfff2377e9e52 100644 (file)
--- a/projects/sgconf/parser.cpp
+++ b/projects/sgconf/parser.cpp
@@ -35,7 +35,8 @@
 
 #include "stg/common.h"
 #include "stg/netunit.h"
-#include "stg/request.h"
+
+#include "request.h"
 
 using namespace std;
 

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index 5aee9de3c9e0dc7f8fdd1f07e9e3ec3a90397f07..eb782f9f58f7ae893e4b7bc5ab2e3824b461b7d9 100755 (executable)
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -54,7 +54,7 @@ fi
 if [ "$sys" = "Darwin" ]
 then
     OS=darwin
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 676bf74ef4614fb3ce2b20767e27c2012c27ea63..3eb6e033dc30a70cd5de6aa43c52b56ed44582ba 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -56,7 +56,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 5c2faf268f8d2417c27ca78822c51ae89c5b6037..9c63e65636e5526d644d88fa5b963e5050a59b60 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -76,7 +76,7 @@ if [ "$sys" = "Darwin" ]
 then
     OS=darwin
     ETC_DIR="./inst/freebsd/etc/stargazer"
-    MAKE="gmake"
+    MAKE="make"
 fi
 
 if [ "$OS" = "unknown" ]