X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/463995e9899beaf6fa381d68d8050b2c449142ff..af1b39c8dba29d0601b540b1892bb22bbe00de0d:/projects/sgauth/build?ds=sidebyside

diff --git a/projects/sgauth/build b/projects/sgauth/build
index 6dc0acc5..51401204 100755
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -24,7 +24,7 @@ else
     then
         DEFS="-DDEBUG"
         MAKEOPTS="-j1"
-        CXXFLAGS="$CXXFLAGS -g3 -W -Wall"
+        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
     else
         MAKEOPTS="-j1"
     fi
@@ -67,15 +67,13 @@ echo "##########################################################################
 
 STG_LIBS="crypto.lib 
 	  common.lib 
-	  common_settings.lib
 	  conffiles.lib
-	  ia_auth_c.lib"
+	  ia.lib"
 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
-    SHELL="/bin/bash"
 else
     if [ "$OS" = "bsd" ]
     then
@@ -90,31 +88,40 @@ else
             LIB_THREAD=-lc_r
         fi
     fi
-    SHELL="/usr/local/bin/bash"
 fi
 
-echo -n "Checking gcc... "
-gcc --version > /dev/null 2> /dev/null
+if [ -z "$CC" ]
+then
+    CC=gcc
+fi
+
+if [ -z "$CXX" ]
+then
+    CXX=g++
+fi
+
+echo -n "Checking CC... "
+$CC --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     echo "FAIL!"
-    echo "gcc not found"
+    echo "$CC not found"
     exit;
 fi
 echo "found"
-echo -n "Checking g++... "
-g++ --version > /dev/null 2> /dev/null
+echo -n "Checking CXX... "
+$CXX --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     echo "FAIL!"
-    echo "g++ not found"
+    echo "$CXX not found"
     exit;
 fi
 echo "found"
 
 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
-gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     echo "FAIL!"
@@ -126,10 +133,12 @@ else
     then
         ARCH=le
         CXXFLAGS="$CXXFLAGS -DARCH_LE"
+        CFLAGS="$CFLAGS -DARCH_LE"
         echo "Little Endian"
     else
         ARCH=be
         CXXFLAGS="$CXXFLAGS -DARCH_BE"
+        CFLAGS="$CFLAGS -DARCH_BE"
         echo "Big Endian"
     fi
 fi
@@ -151,12 +160,13 @@ do
 done
 echo "" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
-echo "SHELL=$SHELL" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
+echo "CFLAGS=$CFLAGS" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 $MAKE $MAKEOPTS