* sim/ucsim/*.*, sim/ucsim/configure, sim/ucsim/configure.in:

[fw/sdcc] / sim / ucsim / configure.in

diff --git a/sim/ucsim/configure.in b/sim/ucsim/configure.in
index e2c137df1abacb8bfbfb1e7eb65c7dfdc7f3920f..339cdc0acafa61b5314b5aa11109cd3336c4d0d0 100644 (file)
--- a/sim/ucsim/configure.in
+++ b/sim/ucsim/configure.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+AC_PREREQ(2.60)
 AC_INIT(.version)
 AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h)
 
@@ -7,7 +8,7 @@ AC_PROG_AWK
 
 AC_MSG_CHECKING(version of the package)
 if test -f ${srcdir}/.version; then
-  VERSION=`cat ${srcdir}/.version`
+  { read VERSION; } < ${srcdir}/.version
   AC_MSG_RESULT($VERSION)
 else
   VERSION="0.0.0"
@@ -118,7 +119,7 @@ AC_SUBST(LIBTOOL_DEPS)
 
 AC_PROG_LEX
 if test ${LEX} = "flex"; then
-       AC_DEFINE(HAVE_FLEX)
+        AC_DEFINE(HAVE_FLEX)
 fi
 AC_PROG_YACC
 AC_CHECK_PROG(BISON_PLUS_PLUS, bison++, bison++, :)
@@ -134,15 +135,7 @@ if test -d /stuff/include; then
 fi
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h)
-AC_CHECK_HEADERS(unistd.h)
-
-AC_CHECK_HEADER(termios.h,
-  AC_DEFINE(HAVE_TERMIOS_H)
-  SERIAL_AVAIL=1,
-  SERIAL_AVAIL=0
-)
-AC_SUBST(SERIAL_AVAIL)
+AC_CHECK_HEADERS(getopt.h unistd.h termios.h)
 
 AC_CHECK_HEADER(curses.h,
   AC_DEFINE(HAVE_CURSES_H)
@@ -158,14 +151,17 @@ AC_CHECK_HEADER(sys/socket.h,
   ucsim_cv_socket="<sys/socket.h>"
 )
 
+WINSOCK_AVAIL=0
 if test $ucsim_cv_socket = unknown; then
   AC_CHECK_HEADER(winsock2.h,
     AC_DEFINE(HAVE_WINSOCK2_H)
     AC_DEFINE(SOCKET_AVAIL)
     AC_DEFINE_UNQUOTED(UCSOCKET_T, SOCKET)
     ucsim_cv_socket="<winsock2.h>"
+    WINSOCK_AVAIL=1
   )
 fi
+AC_SUBST(WINSOCK_AVAIL)
 
 if test $ucsim_cv_socket != unknown; then
   AC_EGREP_HEADER(socklen_t,
@@ -236,7 +232,7 @@ AC_DEFINE_UNQUOTED(HEADER_FD, ${ucsim_cv_fd})
 # Checking for functions/libs
 # ===========================================================================
 if echo $ucsim_cv_socket|grep winsock2 >/dev/null 2>&1; then
-  LIBS="-lwsock32 $LIBS"
+  LIBS="-lws2_32 $LIBS"
 else
   AC_CHECK_LIB(socket,socket)
   AC_CHECK_LIB(nsl,xdr_short)
@@ -297,6 +293,7 @@ AC_SUBST(CURSES_LIBS)
 
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(_vsnprintf)
 AC_CHECK_FUNCS(vasprintf)
 AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup)
 AC_CHECK_FUNCS(strchr memcpy)
@@ -382,7 +379,6 @@ ucsim_ACCEPT_LENGTH_T
 AC_DEFUN(DD_COPT, [
 AC_CACHE_CHECK(whether $$1 accepts -$2,ucsim_cv_$1$2,
 cat >_test_.c <<EOF
-#include <stdio.h>
 int main(void) {return(0);}
 EOF
 $$1 -v -$2 -c _test_.c 1>&5 2>&5
@@ -394,6 +390,30 @@ fi
 rm -f _test_.* a.out)
 ])
 
+# DD_COPT_NO_IGNORE macro checks if the compiler specified as the
+# 1st parameter supports and doesn't ignore option specified as the
+# 2nd parameter
+# For example: DD_COPT_NO_IGNORE(CXX, fPIC)
+
+AC_DEFUN(DD_COPT_NO_IGNORE, [
+AC_CACHE_CHECK(whether $$1 accepts and doesn't ignore -$2,ucsim_cv_$1$2,
+cat >_test_.c <<EOF
+int main(void) {return(0);}
+EOF
+ucsim_cv_$1$2=$($$1 -v -$2 -c _test_.c 2>&1 1>&5)
+if test "$?" = "0"; then
+  expr "$ucsim_cv_$1$2" : '.*'-$2'.*ignored' 1>&5 2>&5
+  if test "$?" = "0"; then
+    ucsim_cv_$1$2="no"
+  else
+    ucsim_cv_$1$2="yes"
+  fi
+else
+  ucsim_cv_$1$2="no"
+fi
+rm -f _test_.* a.out)
+])
+
 
 # Checking characteristics of compilers and other programs
 # --------------------------------------------------------
@@ -404,7 +424,7 @@ if test "$CC" = "i586-mingw32msvc-gcc"; then
   ac_cv_c_bigendian=no
   ac_cv_sizeof_char=1
   ac_cv_sizeof_short=2
-  ac_cv_sizeof_int=4 
+  ac_cv_sizeof_int=4
   ac_cv_sizeof_long=4
   ac_cv_sizeof_long_long=4
 fi
@@ -415,9 +435,9 @@ then
 else
 #echo "CROSS ENDIAN"
     if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then
-       ac_cv_c_bigendian=no
+        ac_cv_c_bigendian=no
     else
-       : # FIXME
+        : # FIXME
     fi
 #echo "CROSS ENDIAN DONE"
 fi
@@ -443,13 +463,13 @@ if test "$ucsim_cv_CXXgstabs" = "yes"; then
    gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
      gopt="-ggdb -g3"
-else 
+else
      gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
-       CXXFLAGS="$gopt"
+        CXXFLAGS="$gopt"
 else
-       CXXFLAGS="$CXXFLAGS $gopt"
+        CXXFLAGS="$CXXFLAGS $gopt"
 fi
 
 DD_COPT(CXX, pipe)
@@ -459,26 +479,18 @@ fi
 
 PICOPT=""
 SHAREDLIB="no"
-DD_COPT(CXX, fPIC)
+DD_COPT_NO_IGNORE(CXX, fPIC)
 if test "$ucsim_cv_CXXfPIC" = "yes"; then
     PICOPT="-fPIC"
 else
-    DD_COPT(CXX, fpic)
+    DD_COPT_NO_IGNORE(CXX, fpic)
     if test "$ucsim_cv_CXXfpic" = "yes"; then
-       PICOPT="-fpic"
+        PICOPT="-fpic"
     fi
 fi
 if test "$PICOPT"x != "x"; then
     SHAREDLIB="yes"
 fi
-# If this is Cygwin neither use Position Independant Code
-# nor build .so
-# Quick + dirty by Bernhard
-# FIXME
-if $CXX --version 2>&1 | grep -i cygming 1>&5 2>&5 || $CXX --version 2>&1 | grep -i cygwin 1>&5 2>&5; then
-    PICOPT=""
-    SHAREDLIB="no"
-fi
 AC_SUBST(SHAREDLIB)
 AC_SUBST(PICOPT)
 
@@ -500,13 +512,13 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 else
     if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then
-       ac_cv_sizeof_char=1
-       ac_cv_sizeof_short=2
-       ac_cv_sizeof_int=4 
-       ac_cv_sizeof_long=4
-       ac_cv_sizeof_long_long=4
+        ac_cv_sizeof_char=1
+        ac_cv_sizeof_short=2
+        ac_cv_sizeof_int=4
+        ac_cv_sizeof_long=4
+        ac_cv_sizeof_long_long=4
     else
-       : # FIXME
+        : # FIXME
     fi
 #echo
 fi
@@ -514,24 +526,24 @@ fi
 type_name()
 {
     if expr "$ac_cv_sizeof_char" '>=' "$1" >/dev/null; then
-       echo "char"
-       exit
+        echo "char"
+        exit
     fi
     if expr "$ac_cv_sizeof_short" '>=' "$1" >/dev/null; then
-       echo "short"
-       exit
+        echo "short"
+        exit
     fi
     if expr "$ac_cv_sizeof_int" '>=' "$1" >/dev/null; then
-       echo "int"
-       exit
+        echo "int"
+        exit
     fi
     if expr "$ac_cv_sizeof_long" '>=' "$1" >/dev/null; then
-       echo "long"
-       exit
+        echo "long"
+        exit
     fi
     if expr "$ac_cv_sizeof_long_long" '>=' "$1" >/dev/null; then
-       echo "long long"
-       exit
+        echo "long long"
+        exit
     fi
     echo "long long"
 }