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

[stg.git] / projects / sgauth / build

diff --git a/projects/sgauth/build b/projects/sgauth/build
index 81edf8d4d4221ab65904736bc0aa616d0493c2e6..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"
@@ -97,7 +97,6 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
-                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -161,7 +160,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"