projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2005-05-25 Sebastien Pouliot <sebastien@ximian.com>
[mono.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index 3924a4f78308ffce7a8a80bd606c9fcf088a63e4..8531d428198f1fd907093cc312863f8199e045ad 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-6,7
+6,7
@@
AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.
6.
9)
+AM_INIT_AUTOMAKE(mono,1.1.
7.9
9)
AM_MAINTAINER_MODE
AC_PROG_LN_S
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@
-252,6
+252,7
@@
AC_SUBST(BUILD_EXEEXT)
# Set STDC_HEADERS
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
# Set STDC_HEADERS
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_FAST_INSTALL
AM_PROG_LIBTOOL
# Test whenever ld supports -version-script
AM_PROG_LIBTOOL
# Test whenever ld supports -version-script
@@
-1330,6
+1331,9
@@
JIT_SUPPORTED=no
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
+SQLITE="libsqlite.so.0"
+SQLITE3="libsqlite3.so.0"
+X11="libX11.so.6.2"
jit_wanted=false
interp_wanted=false
jit_wanted=false
interp_wanted=false
@@
-1359,8
+1363,12
@@
case "$host" in
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
- LIBC="libc.so"
- INTL="libintl.so"
+ case $host_os in
+ linux*) ;;
+ *)
+ LIBC="libc.so"
+ INTL="libintl.so"
+ esac
jit_wanted=true
if test x"$GCC" = xyes; then
CFLAGS="$CFLAGS -Wno-cast-align"
jit_wanted=true
if test x"$GCC" = xyes; then
CFLAGS="$CFLAGS -Wno-cast-align"
@@
-1373,6
+1381,11
@@
case "$host" in
INTERP_SUPPORTED=yes
interp_wanted=true
arch_target=alpha;
INTERP_SUPPORTED=yes
interp_wanted=true
arch_target=alpha;
+ case $host_os in
+ linux*)
+ LIBC="libc.so.6.1"
+ INTL="libc.so.6.1"
+ esac
;;
*-*-mingw*|*-*-cygwin*)
INTL="intl"
;;
*-*-mingw*|*-*-cygwin*)
INTL="intl"
@@
-1481,6
+1494,9
@@
case "$host" in
libsuffix=".dylib"
LIBC="libc.dylib"
INTL="libintl.dylib"
libsuffix=".dylib"
LIBC="libc.dylib"
INTL="libintl.dylib"
+ SQLITE="libsqlite.0.dylib"
+ SQLITE3="libsqlite3.0.dylib"
+ X11="libX11.dylib"
;;
*-*-*netbsd*)
LIBC="libc.so.12"
;;
*-*-*netbsd*)
LIBC="libc.so.12"
@@
-1594,6
+1610,9
@@
AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
AC_SUBST(LIBC)
AC_SUBST(INTL)
AC_SUBST(LIBC)
AC_SUBST(INTL)
+AC_SUBST(SQLITE)
+AC_SUBST(SQLITE3)
+AC_SUBST(X11)
AC_SUBST(arch_target)
AC_SUBST(CFLAGS)
AC_SUBST(arch_target)
AC_SUBST(CFLAGS)
@@
-1672,6
+1691,7
@@
mono/arch/s390/Makefile
mono/arch/s390x/Makefile
mono/arch/arm/Makefile
mono/arch/alpha/Makefile
mono/arch/s390x/Makefile
mono/arch/arm/Makefile
mono/arch/alpha/Makefile
+mono/arch/ia64/Makefile
mono/interpreter/Makefile
mono/tests/Makefile
mono/tests/tests-config
mono/interpreter/Makefile
mono/tests/Makefile
mono/tests/tests-config