ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/configure.ac

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.46 by gbeauche, 2005-05-15T17:22:12Z vs.
Revision 1.56 by gbeauche, 2005-12-04T15:45:09Z

#	Line 60 | Line 60 | AC_ARG_ENABLE(addressing,
60
61		dnl External packages.
62		AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
63	<	AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
63	>	AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]],
64	>	[case "$withval" in
65	>	gtk1)      WANT_GTK="gtk";;
66	>	gtk|gtk2)  WANT_GTK="$withval";;
67	>	yes)       WANT_GTK="gtk2 gtk";;
68	>	*)         WANT_GTK="no";;
69	>	esac],
70	>	[WANT_GTK="gtk2 gtk"])
71		AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
72
73		dnl Canonical system information.
#	Line 129 | Line 136 | dnl Checks for libraries.
136		AC_CHECK_LIB(posix4, sem_init)
137		AC_CHECK_LIB(rt, timer_create)
138		AC_CHECK_LIB(rt, shm_open)
139	+	AC_CHECK_LIB(m, cos)
140
141		dnl Do we need SDL?
142		WANT_SDL=no
#	Line 195 | Line 203 | AC_CHECK_LIB(pthread, pthread_create, ,
203		if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
204		AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
205		fi
206	+	AC_CHECK_FUNCS(pthread_cond_init)
207		AC_CHECK_FUNCS(pthread_cancel pthread_testcancel)
208		AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
209		AC_CHECK_FUNCS(pthread_mutexattr_settype)
#	Line 239 | Line 248 | fi
248
249		dnl We use GTK+ if possible.
250		UISRCS=../dummy/prefs_editor_dummy.cpp
251	<	if [[ "x$WANT_GTK" = "xyes" ]]; then
251	>	case "x$WANT_GTK" in
252	>	xgtk2*)
253	>	AM_PATH_GTK_2_0(1.3.15, [
254	>	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
255	>	CFLAGS="$CFLAGS $GTK_CFLAGS"
256	>	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257	>	LIBS="$LIBS $GTK_LIBS"
258	>	UISRCS=prefs_editor_gtk.cpp
259	>	WANT_GTK=gtk2
260	>	], [
261	>	case "x${WANT_GTK}x" in
262	>	*gtkx)
263	>	AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
264	>	WANT_GTK=gtk
265	>	;;
266	>	*)
267	>	AC_MSG_WARN([Could not find GTK+, disabling user interface.])
268	>	WANT_GTK=no
269	>	;;
270	>	esac
271	>	])
272	>	;;
273	>	esac
274	>	if [[ "x$WANT_GTK" = "xgtk" ]]; then
275		AM_PATH_GTK(1.2.0, [
276		AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
277		CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
#	Line 278 | Line 310 | AC_SYS_LARGEFILE
310
311		dnl Checks for header files.
312		AC_HEADER_STDC
313	+	AC_CHECK_HEADERS(stdlib.h stdint.h)
314		AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
315		AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
316		AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
#	Line 292 | Line 325 | AC_CHECK_HEADERS(linux/if.h linux/if_tun
325		#endif
326		])
327		AC_CHECK_HEADERS(AvailabilityMacros.h)
328	+	AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
329
330		dnl Checks for typedefs, structures, and compiler characteristics.
331		AC_C_BIGENDIAN
#	Line 389 | Line 423 | dnl (end of code from openssh-3.2.2p1 co
423
424
425		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
426	<	AC_DEFUN(AC_CHECK_FRAMEWORK, [
426	>	AC_DEFUN([AC_CHECK_FRAMEWORK], [
427		AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
428		AC_CACHE_CHECK([whether compiler supports framework $1],
429		ac_Framework, [
#	Line 409 | Line 443 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
443		dnl Check for some MacOS X frameworks
444		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
445		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
446	+	AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
447
448		dnl Select system-dependant source files.
449		SERIALSRC=serial_unix.cpp
#	Line 459 | Line 494 | irix*)
494		ETHERSRC=ether_unix.cpp
495		AUDIOSRC=Irix/audio_irix.cpp
496		EXTRASYSSRCS=Irix/unaligned.c
462	–	dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
463	–	DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
497		LIBS="$LIBS -laudio"
498		WANT_ESD=no
499
#	Line 470 | Line 503 | irix*)
503		CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
504		AC_MSG_CHECKING(if "-IPA" works)
505		dnl Do a test compile of an empty function
506	<	AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
506	>	AC_TRY_COMPILE([#if defined __GNUC__
507	>	# error GCC does not support IPA yet
508	>	#endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
509		CFLAGS="$ocflags"
510		;;
511		darwin*)
512		ETHERSRC=ether_unix.cpp
513	<	if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
513	>	if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
514		EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
515		fi
516		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
#	Line 552 | Line 587 | dnl to be put into the config.h file
587		dnl $1 -- the macro to define
588		dnl $2 -- the value to translate
589		dnl $3 -- template name
590	<	AC_DEFUN(AC_TRANSLATE_DEFINE, [
590	>	AC_DEFUN([AC_TRANSLATE_DEFINE], [
591		if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
592		AC_DEFINE($1, 1, $3)
593		fi
#	Line 1079 | Line 1114 | AC_MSG_RESULT($HAVE_GAS)
1114		dnl Check for GCC 2.7 or higher.
1115		HAVE_GCC27=no
1116		AC_MSG_CHECKING(for GCC 2.7 or higher)
1117	<	AC_EGREP_CPP(xyes,
1118	<	[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1119	<	xyes
1120	<	#endif
1121	<	], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1117	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1118	>	# error gcc < 2.7
1119	>	#endif
1120	>	]])],
1121	>	[AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1122	>	[AC_MSG_RESULT(no)])
1123
1124		dnl Check for GCC 3.0 or higher.
1125		HAVE_GCC30=no
1126		AC_MSG_CHECKING(for GCC 3.0 or higher)
1127	<	AC_EGREP_CPP(xyes,
1128	<	[#if __GNUC__ >= 3
1129	<	xyes
1130	<	#endif
1131	<	], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1127	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1128	>	# error gcc < 3
1129	>	#endif
1130	>	]])],
1131	>	[AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1132	>	[AC_MSG_RESULT(no)])
1133
1134		dnl Check for ICC.
1135		AC_MSG_CHECKING(for ICC)
#	Line 1152 | Line 1189 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1189		AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1190		ac_cv_gcc_no_strict_aliasing, [
1191		AC_TRY_COMPILE([],[],
1192	<	[ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "$CFLAGS")],
1192	>	[ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1193		[ac_cv_gcc_no_strict_aliasing=no])
1194		])
1195		CFLAGS="$SAVED_CFLAGS"
1196		fi
1197
1198	+	dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1199	+	if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1200	+	SAVED_CFLAGS="$CFLAGS"
1201	+	CFLAGS="$CFLAGS -mdynamic-no-pic"
1202	+	AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1203	+	ac_cv_gcc_mdynamic_no_pic, [
1204	+	AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1205	+	])
1206	+	if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1207	+	CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1208	+	else
1209	+	CFLAGS="$SAVED_CFLAGS"
1210	+	fi
1211	+	fi
1212	+
1213		dnl Select appropriate CPU source and REGPARAM define.
1214		ASM_OPTIMIZATIONS=none
1215		CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines