From 1751c97b59fa9359458012716944d3cdc540bb41 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Mon, 20 Dec 2010 16:53:44 +0200
Subject: [PATCH] =?utf8?q?=D0=92=D0=B8=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BC=D0=B8=D0=BB=D0=BA=D0=B8=20?=
 =?utf8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D1=96=D0=BB=D1=8F=D1=86=D1=96=D1=97=20?=
 =?utf8?q?=D0=BD=D0=B0=20FreeBSD8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 projects/rlm_stg/build       | 1 +
 projects/rlm_stg/libradius.h | 1 +
 projects/rlm_stg/radiusd.h   | 2 +-
 projects/sgconf_xml/Makefile | 8 ++++----
 projects/sgconf_xml/build    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
index e1102fc4..8f45a87b 100755
--- a/projects/rlm_stg/build
+++ b/projects/rlm_stg/build
@@ -84,6 +84,7 @@ else
         fi
     fi
     SHELL="/usr/local/bin/bash"
+    CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"
 fi
 
 echo -n "Checking endianess... "
diff --git a/projects/rlm_stg/libradius.h b/projects/rlm_stg/libradius.h
index 4e926bfd..a8feaaab 100644
--- a/projects/rlm_stg/libradius.h
+++ b/projects/rlm_stg/libradius.h
@@ -28,6 +28,7 @@
 //RCSIDH(libradius_h, "$Id: libradius.h,v 1.1 2010/08/14 04:13:52 faust Exp $")
 
 #include <errno.h>
+#include <time.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/projects/rlm_stg/radiusd.h b/projects/rlm_stg/radiusd.h
index a5a61b93..4cbf4034 100644
--- a/projects/rlm_stg/radiusd.h
+++ b/projects/rlm_stg/radiusd.h
@@ -169,7 +169,7 @@ typedef enum RAD_LISTEN_TYPE {
 	RAD_LISTEN_MAX
 } RAD_LISTEN_TYPE;
 
-#ifdef FREE_BSD
+#if defined(FREE_BSD) || defined(FREE_BSD5)
 #include <sys/time.h>
 #endif
 
diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index d0a5550c..60288877 100644
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -49,8 +49,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
 	$(MAKE) -C $(DIR_LIBSRC)
 
-$(PROG): $(OBJS) $(LIBS)
-	$(CC) $^ $(LDFLAGS) -o $(PROG)
+$(PROG): $(OBJS) $(STGLIBS)
+	$(CC) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
 
 clean:
 	rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -95,8 +95,8 @@ deps:	$(SRCS) ../../Makefile.conf
 	$(MAKE) -C $(DIR_LIBSRC) includes
 	@>deps ;\
 	for file in $(SRCS); do\
-	  echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
-	  echo -e '\t$$(CC) -c $$< $(CFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+	  echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
+	  echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
 	done
 
 
diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index a4857105..ae08b781 100755
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -115,7 +115,7 @@ rm -f fake
 
 echo -n "Checking for -lexpat... "
 echo "int main() { return 0; }" > build_check.c
-gcc build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+gcc $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     CHECK_EXPAT=no
-- 
2.44.2