projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/sdccman.lyx: added to the manual
[fw/sdcc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index 993a35204feb3739c8980cb9012c4207786296da..4d22c749320fbba44642e82293514223cd7f86ad 100755
(executable)
--- a/
configure.in
+++ b/
configure.in
@@
-63,13
+63,21
@@
AC_LANG([C])
# Checking for header files.
# ===========================================================================
# Checking for header files.
# ===========================================================================
-AC_CHECK_HEADERS(sys/socket.h)
+socket_type=unknown
+AC_CHECK_HEADERS(sys/socket.h, socket_type=sys_socket_h)
+if test $socket_type = unknown; then
+ AC_CHECK_HEADERS(winsock2.h, socket_type=winsock2_h)
+fi
# Checking for functions/libs
# ===========================================================================
# Checking for functions/libs
# ===========================================================================
-AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(nsl,xdr_short)
+if test $socket_type = winsock2_h; then
+ LIBS="-lws2_32 $LIBS"
+else
+ AC_CHECK_LIB(socket,socket)
+ AC_CHECK_LIB(nsl,xdr_short)
+fi
# Checking for functions
# Checking for functions
@@
-344,30
+352,36
@@
AC_CHECK_SIZEOF(char)
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
+AC_C_CHAR_UNSIGNED
type_name()
{
type_name()
{
- if expr "$ac_cv_sizeof_char" '>=' "$1" >/dev/null; then
- echo "char"
- exit
- fi
- if expr "$ac_cv_sizeof_short" '>=' "$1" >/dev/null; then
- echo "short"
- exit
- fi
- if expr "$ac_cv_sizeof_int" '>=' "$1" >/dev/null; then
- echo "int"
- exit
- fi
- if expr "$ac_cv_sizeof_long" '>=' "$1" >/dev/null; then
- echo "long"
- exit
- fi
+ if expr "$ac_cv_sizeof_char" '>=' "$1" >/dev/null; then
+ echo "char"
+ exit
+ fi
+ if expr "$ac_cv_sizeof_short" '>=' "$1" >/dev/null; then
+ echo "short"
+ exit
+ fi
+ if expr "$ac_cv_sizeof_int" '>=' "$1" >/dev/null; then
+ echo "int"
+ exit
+ fi
+ if expr "$ac_cv_sizeof_long" '>=' "$1" >/dev/null; then
echo "long"
echo "long"
+ exit
+ fi
+ echo "long"
}
AC_MSG_CHECKING(type name for byte)
}
AC_MSG_CHECKING(type name for byte)
-TYPE_BYTE=`type_name 1`
+TYPE_CHAR=`type_name 1`
+if test "$ac_cv_c_char_unsigned" = "yes"; then
+ TYPE_BYTE="signed $TYPE_CHAR"
+else
+ TYPE_BYTE=$TYPE_CHAR
+fi
AC_MSG_RESULT($TYPE_BYTE)
AC_MSG_CHECKING(type name for word)
TYPE_WORD=`type_name 2`
AC_MSG_RESULT($TYPE_BYTE)
AC_MSG_CHECKING(type name for word)
TYPE_WORD=`type_name 2`
@@
-375,10
+389,15
@@
AC_MSG_RESULT($TYPE_WORD)
AC_MSG_CHECKING(type name for dword)
TYPE_DWORD=`type_name 4`
AC_MSG_RESULT($TYPE_DWORD)
AC_MSG_CHECKING(type name for dword)
TYPE_DWORD=`type_name 4`
AC_MSG_RESULT($TYPE_DWORD)
+
AC_DEFINE_UNQUOTED(TYPE_BYTE, $TYPE_BYTE)
AC_DEFINE_UNQUOTED(TYPE_WORD, $TYPE_WORD)
AC_DEFINE_UNQUOTED(TYPE_DWORD, $TYPE_DWORD)
AC_DEFINE_UNQUOTED(TYPE_BYTE, $TYPE_BYTE)
AC_DEFINE_UNQUOTED(TYPE_WORD, $TYPE_WORD)
AC_DEFINE_UNQUOTED(TYPE_DWORD, $TYPE_DWORD)
+AC_DEFINE_UNQUOTED(TYPE_UBYTE, unsigned $TYPE_CHAR)
+AC_DEFINE_UNQUOTED(TYPE_UWORD, unsigned $TYPE_WORD)
+AC_DEFINE_UNQUOTED(TYPE_UDWORD, unsigned $TYPE_DWORD)
+
AC_C_BIGENDIAN
# Set standard installation paths
AC_C_BIGENDIAN
# Set standard installation paths
@@
-653,6
+672,7
@@
fi
if test $OPT_DISABLE_MCS51 = 0; then
AC_CONFIG_FILES([src/mcs51/Makefile
as/mcs51/Makefile
if test $OPT_DISABLE_MCS51 = 0; then
AC_CONFIG_FILES([src/mcs51/Makefile
as/mcs51/Makefile
+ as/link/mcs51/Makefile
debugger/mcs51/Makefile])
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
device/lib/small/Makefile
debugger/mcs51/Makefile])
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
device/lib/small/Makefile
@@
-675,8
+695,8
@@
if test $OPT_DISABLE_Z80 = 0; then
AC_CONFIG_FILES([src/z80/Makefile
as/Makefile
as/z80/Makefile
AC_CONFIG_FILES([src/z80/Makefile
as/Makefile
as/z80/Makefile
- link/Makefile
- link/z80/Makefile])
+
as/
link/Makefile
+
as/
link/z80/Makefile])
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/z80/Makefile
device/lib/gbz80/Makefile])
fi
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/z80/Makefile
device/lib/gbz80/Makefile])
fi