Added "smart" iconv 2nd arg const-ness detection.

[stg.git] / projects / sgconf_xml / build

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index 34cd804ff1dc59dfa17af9f6f3bf3aa0d01a6d98..10de5f003478d554ab1078bd1ead6af06d61e212 100755 (executable)
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -159,6 +159,19 @@ else
     printf "yes\n"
 fi
 rm -f fake
     printf "yes\n"
 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
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    DEFS="$DEFS -DCONST_ICONV"
+    printf "non-const\n"
+else
+    printf "const\n"
+fi
+rm -f fake
+

 rm -f build_check.c
 
 if [ "$CHECK_EXPAT" != "yes" ]
 rm -f build_check.c
 
 if [ "$CHECK_EXPAT" != "yes" ]


@@ -184,6 +197,8 @@ 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