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

[stg.git] / projects / sgconf_xml / build

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

-    MAKE="gmake"
+    MAKE="make"

 fi
 
 if [ "$OS" = "unknown" ]
 fi
 
 if [ "$OS" = "unknown" ]


@@ -83,13 +83,20 @@ else
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"

+        LIB_THREAD=-lc_r

     else
     else

-        DEFS="$DEFS -DFREE_BSD5"

         if [ "$OS" = "bsd7" ]
         then
         if [ "$OS" = "bsd7" ]
         then

+            DEFS="$DEFS -DFREE_BSD5"

             LIB_THREAD=-lpthread
         else
             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
         fi
     fi
 fi