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.63 by gbeauche, 2006-03-14T22:14:13Z vs.
Revision 1.67 by gbeauche, 2006-04-16T21:25:41Z

#	Line 14 | Line 14 | dnl Some systems do not put corefiles in
14		dnl cores for the configure tests since some are intended to dump core.
15		ulimit -c 0
16
17	+	AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
18	+
19		dnl Video options.
20		AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
21		AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
#	Line 252 | Line 254 | case "x$WANT_GTK" in
254		xgtk2*)
255		AM_PATH_GTK_2_0(1.3.15, [
256		AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
257	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
258	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257	<	LIBS="$LIBS $GTK_LIBS"
257	>	GUI_CFLAGS="$GTK_CFLAGS"
258	>	GUI_LIBS="$GTK_LIBS"
259		UISRCS=prefs_editor_gtk.cpp
260		WANT_GTK=gtk2
261		], [
#	Line 274 | Line 275 | esac
275		if [[ "x$WANT_GTK" = "xgtk" ]]; then
276		AM_PATH_GTK(1.2.0, [
277		AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
278	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
279	<	LIBS="$LIBS $GTK_LIBS"
278	>	GUI_CFLAGS="$GTK_CFLAGS"
279	>	GUI_LIBS="$GTK_LIBS"
280		UISRCS=prefs_editor_gtk.cpp
281		dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
282		dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
#	Line 283 | Line 284 | if [[ "x$WANT_GTK" = "xgtk" ]]; then
284		AM_GNU_GETTEXT
285		B2_PATH_GNOMEUI([
286		AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
287	<	CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
288	<	LIBS="$LIBS $GNOMEUI_LIBS"
287	>	GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
288	>	GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
289		], [])
290		], [
291		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
292		WANT_GTK=no
293		])
294		fi
295	+	AC_SUBST(GUI_CFLAGS)
296	+	AC_SUBST(GUI_LIBS)
297	+
298	+	dnl Enable standalone GUI?
299	+	if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
300	+	WANT_STANDALONE_GUI=no
301	+	fi
302	+	if [[ "$WANT_GTK" = "no" ]]; then
303	+	WANT_STANDALONE_GUI=no
304	+	fi
305	+	if [[ "$WANT_STANDALONE_GUI" = "yes" ]]; then
306	+	UISRCS=""
307	+	AC_DEFINE(STANDALONE_GUI, 1, [Define to use build a standalone GUI prefs editor.])
308	+	fi
309	+	AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
310
311		dnl We use ESD if possible.
312		if [[ "x$WANT_ESD" = "xyes" ]]; then
#	Line 1101 | Line 1117 | dnl Check for linker script support
1117		case $target_os:$target_cpu in
1118		linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1119		linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1120	<	darwin*:powerpc)LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1120	>	linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1121	>	netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1122	>	freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1123	>	darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1124		esac
1125		if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1126		AC_CACHE_CHECK([whether linker script is usable],

Diff Legend

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