X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4afaecdd25eb53949f523e5d4891d5dbbfadb63d..f298b4a17d43ba8e3d9125a9135b60fbd29b6b6b:/projects/sgconf/build?ds=inline diff --git a/projects/sgconf/build b/projects/sgconf/build index a498e0c5..e2eb835b 100755 --- a/projects/sgconf/build +++ b/projects/sgconf/build @@ -80,6 +80,7 @@ then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread else + LIBICONV="-liconv" if [ "$OS" = "bsd" ] then DEFS="$DEFS -DFREE_BSD" @@ -93,6 +94,7 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread + LIBICONV="" else LIB_THREAD=-lc_r fi @@ -166,6 +168,19 @@ else printf "yes\n" 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 if [ "$CHECK_EXPAT" != "yes" ] @@ -191,9 +206,12 @@ do 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 "LIBICONV=$LIBICONV\n" >> $CONFFILE printf "PREFIX=$PREFIX\n" >> $CONFFILE printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE