Виправлено помилки компіляції на FreeBSD8

diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
index e1102fc405edfce1ad7d8a30e7c06776f73469b0..8f45a87b17fa0ce2ef2b2d1d570a83c6fcf29043 100755 (executable)
--- a/projects/rlm_stg/build
+++ b/projects/rlm_stg/build
@@ -84,6 +84,7 @@ else
         fi
     fi
     SHELL="/usr/local/bin/bash"
         fi
     fi
     SHELL="/usr/local/bin/bash"

+    CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"

 fi
 
 echo -n "Checking endianess... "
 fi
 
 echo -n "Checking endianess... "

diff --git a/projects/rlm_stg/libradius.h b/projects/rlm_stg/libradius.h
index 4e926bfdb9114190d98cceeeb5bc725fa0148985..a8feaaabd826c35504830b5b8e3b463b03e98888 100644 (file)
--- 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>
 //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>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/projects/rlm_stg/radiusd.h b/projects/rlm_stg/radiusd.h
index a5a61b934e396a4c5b3167fd28cc0f000ef74e54..4cbf4034389c60cce1bb58ba9b3bf45cf2049224 100644 (file)
--- 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;
 
        RAD_LISTEN_MAX
 } RAD_LISTEN_TYPE;
 

-#ifdef FREE_BSD
+#if defined(FREE_BSD) || defined(FREE_BSD5)

 #include <sys/time.h>
 #endif
 
 #include <sys/time.h>
 #endif
 

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index d0a5550c24da10d7113da7313625b21e3523506a..60288877bd731f729920e83d9707ccfd106c54ff 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -49,8 +49,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 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
 
 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\
        $(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
 
 
        done
 
 

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index a4857105a2182de7d0f661732c2c5935740f7306..ae08b781d690b1def6cff7195905d2ecc218e96e 100755 (executable)
--- 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
 
 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
 if [ $? != 0 ]
 then
     CHECK_EXPAT=no