Ticket 37. Single quotes added in the message for user login, tariff name,

[stg.git] / projects / sgauth / build

diff --git a/projects/sgauth/build b/projects/sgauth/build
index 203e0c889c261162dabaf41fffd80d8aaec6e4e4..cef1da1d9c63055565d2c980da3bf8492f4e4af3 100755 (executable)
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -7,7 +7,8 @@
 
 OS=unknown
 sys=`uname -s`
 
 OS=unknown
 sys=`uname -s`

-release=`uname -r | cut -b1`
+release=`uname -r`
+major=`printf "%s" "$release" | cut -d. -f1`

 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 PREFIX="/"


@@ -35,28 +36,35 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 if [ "$sys" = "Linux" ]
 then
     OS=linux
 if [ "$sys" = "Linux" ]
 then
     OS=linux

-    release=""

     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then
     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then

-    case $release in
+    case $major in

         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
         7) OS=bsd7;;
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
         7) OS=bsd7;;

-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;

     esac
     MAKE="gmake"
 fi
 
     esac
     MAKE="gmake"
 fi
 

+if [ "$sys" = "Darwin" ]
+then
+    OS=darwin
+    ETC_DIR="./inst/freebsd/etc/stargazer"
+    MAKE="gmake"
+    CFLAGS="$CFLAGS -I/opt/local/include"
+    CXXFLAGS="$CFLAGS -I/opt/local/include"
+    LDFLAGS="$LDFLAGS -L/opt/local/lib"
+fi
+

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

-then 
+then

     printf "#############################################################################\n"
     printf "#############################################################################\n"

-    printf "# Sorry, but sgauth currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but sgauth is currently supported by Linux, FreeBSD and Darwin.    #\n"

     printf "#############################################################################\n"
     exit 1
 fi
     printf "#############################################################################\n"
     exit 1
 fi


@@ -65,27 +73,34 @@ printf "########################################################################
 printf "       Building sgauth for $sys $release\n"
 printf "#############################################################################\n"
 
 printf "       Building sgauth for $sys $release\n"
 printf "#############################################################################\n"
 

-STG_LIBS="crypto.lib 
-         common.lib 
-         conffiles.lib
-         ia.lib"
+STG_LIBS="crypto.lib
+          common.lib
+          conffiles.lib
+          ia.lib"

 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else

+    LIBICONV="-liconv"

     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
+                LIBICONV=""
+            else
+                LIB_THREAD=-lc_r
+            fi

         fi
     fi
 fi
         fi
     fi
 fi


@@ -143,6 +158,19 @@ else
     fi
 fi
 rm -f fake
     fi
 fi
 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
+$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "non-const\n"
+else
+    DEFS="$DEFS -DCONST_ICONV"
+    printf "const\n"
+fi
+rm -f fake
+

 rm -f build_check.c
 
 printf "OS=$OS\n" > $CONFFILE
 rm -f build_check.c
 
 printf "OS=$OS\n" > $CONFFILE


@@ -161,13 +189,21 @@ do
 done
 printf "\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
 done
 printf "\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE

+printf "CC=$CC\n" >> $CONFFILE
+printf "CXX=$CXX\n" >> $CONFFILE

 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE

+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE

 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE
 printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE
 printf "OWNER=$OWNER\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE
 printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE
 printf "OWNER=$OWNER\n" >> $CONFFILE

-$MAKE $MAKEOPTS

 
 

+if [ "$1" != "debug" ]
+then
+    $MAKE $MAKEOPTS
+else
+    printf "\n\n\nDebug build. Type $MAKE explicitly\n"
+fi