X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/02a231ed70f2116c607b831c6a48b3490bd9a804..d2fc992c13b7684957b4bfa4b409389e9383d333:/projects/sgauth/build?ds=sidebyside diff --git a/projects/sgauth/build b/projects/sgauth/build index 0e7e5f01..3e5833fc 100755 --- 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" @@ -83,6 +83,7 @@ then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread else + LIBICONV="-liconv" if [ "$OS" = "bsd" ] then DEFS="$DEFS -DFREE_BSD" @@ -156,6 +157,19 @@ else fi fi rm -f fake + +printf "Checking for iconv 2nd argument... " +printf "#include \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 @@ -179,6 +193,7 @@ printf "CXX=$CXX\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