Update ChangeLog.

[stg.git] / projects / libs / build

diff --git a/projects/libs/build b/projects/libs/build
index 1d40d725628d9ec955c660a7a6d409190c7a3558..61664a59d19cef429eaa585e5bbab1b1af1d0e04 100755 (executable)
--- a/projects/libs/build
+++ b/projects/libs/build
@@ -1,10 +1,5 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#   $Revision: 1.57 $
-#   $Author: faust $
-#   $Date: 2010/05/09 12:39:01 $
-######################################################
-

 # Installation path prefix
 
 #PREFIX=""
 # Installation path prefix
 
 #PREFIX=""


@@ -70,7 +65,7 @@ fi
 if [ "$sys" = "Darwin" ]
 then
     OS=darwin
 if [ "$sys" = "Darwin" ]
 then
     OS=darwin

-    MAKE="gmake"
+    MAKE="make"

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


@@ -100,6 +95,7 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
 else
 then
     DEFS="$DEFS -DLINUX"
 else

+    LIBICONV="-liconv"

     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"


@@ -126,6 +122,16 @@ then
     CXX=g++
 fi
 
     CXX=g++
 fi
 

+if [ -z "$AR" ]
+then
+    AR=ar
+fi
+
+if [ -z "$RANLIB" ]
+then
+    RANLIB=ranlib
+fi
+

 printf "Checking CC... "
 $CC --version > /dev/null 2> /dev/null
 if [ $? != 0 ]
 printf "Checking CC... "
 $CC --version > /dev/null 2> /dev/null
 if [ $? != 0 ]


@@ -144,6 +150,24 @@ then
     exit;
 fi
 printf "found\n"
     exit;
 fi
 printf "found\n"

+printf "Checking AR... "
+$AR --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "FAIL!\n"
+    printf "$AR not found\n"
+    exit;
+fi
+printf "found\n"
+printf "Checking RANLIB... "
+$RANLIB --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "FAIL!\n"
+    printf "$RANLIB not found\n"
+    exit;
+fi
+printf "found\n"

 
 printf "Checking endianess... "
 printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c
 
 printf "Checking endianess... "
 printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c


@@ -172,7 +196,7 @@ rm -f fake
 
 printf "Checking for -lexpat... "
 printf "#include <expat.h>\nint main() { return 0; }\n" > build_check.c
 
 printf "Checking for -lexpat... "
 printf "#include <expat.h>\nint main() { return 0; }\n" > build_check.c

-$CXX $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null

 if [ $? != 0 ]
 then
     CHECK_EXPAT=no
 if [ $? != 0 ]
 then
     CHECK_EXPAT=no


@@ -183,6 +207,18 @@ else
 fi
 rm -f fake
 
 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
+

 printf "Checking for fb_config... "
 FB_VERSION=`fb_config --version 2> /dev/null`
 if [ "$?" != "0" ]
 printf "Checking for fb_config... "
 FB_VERSION=`fb_config --version 2> /dev/null`
 if [ "$?" != "0" ]


@@ -190,7 +226,7 @@ then
     printf "no\n"
     printf "Checking for -lfbclient... "
     printf "int main() { return 0; }\n" > build_check.c
     printf "no\n"
     printf "Checking for -lfbclient... "
     printf "int main() { return 0; }\n" > build_check.c

-    $CXX $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
+    $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null

     if [ $? != 0 ]
     then
         CHECK_FBCLIENT=no
     if [ $? != 0 ]
     then
         CHECK_FBCLIENT=no


@@ -263,9 +299,12 @@ done
 printf "\n" >> $CONFFILE
 printf "CC=$CC\n" >> $CONFFILE
 printf "CXX=$CXX\n" >> $CONFFILE
 printf "\n" >> $CONFFILE
 printf "CC=$CC\n" >> $CONFFILE
 printf "CXX=$CXX\n" >> $CONFFILE

+printf "AR=$AR\n" >> $CONFFILE
+printf "RANLIB=$RANLIB\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 "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE