Attachment #104172 for bug #146784





all:
	@echo "Please run config.sh before make!"
	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
	@echo
	@echo "Supported <platform> values:"
	@echo
	@echo "  win32          Microsoft Windows"
	@echo "  linux          Linux"
	@echo "  macos          Macintosh OS X (not Classic)"
	@echo "  linux-static   Linux (statically linked)"
	@echo
	@echo "Supported <option> values:"
	@echo "  -nox11         Disables X11, removing binary dependency."
	@echo "  -x11           Forces X11 support, even if 'X' isn't found."
	@echo
	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
	@echo "e.g.: ./config.sh win32"
	@echo




fi

if [ "$ARCH" != "win32" -a "$ARCH" != "psp" ]; then
	# default, enable X support
	X11="true"

	# attempt auto-detection
	if [ "$4" = "" ]; then
		# try to run X
		X -version >/dev/null 2>&1

		# X queried successfully
		if [ "$?" != "0" ]; then
			X11="false"
		fi
	fi

	# don't autodetect, force off
	if [ "$4" = "-nox11" ]; then
		X11="false"
	fi

	# asked for X11?
	if [ "$X11" = "true" ]; then
		# enable the C++ bits
		echo "#define CONFIG_X11" >> src/config.h


fi

echo "All done!"






all:
	@echo "Please run config.sh before make!"
	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
	@echo
	@echo "Supported <platform> values:"
	@echo
	@echo "  win32          Microsoft Windows"
	@echo "  linux          Linux"
	@echo "  macos          Macintosh OS X (not Classic)"
	@echo "  linux-static   Linux (statically linked)"
	@echo
	@echo "Supported <option> values:"
	@echo "  -nox11         Disables X11, removing binary dependency."
	@echo "  -x11           Forces X11 support, even if 'X' isn't found."
	@echo
	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
	@echo "e.g.: ./config.sh win32"
	@echo

Return to bug 146784

Lines 69-79 Link Here

(-)mzx281d/config.sh (-4 / +21 lines)
69	fi	69	fi
70		70
71	if [ "$ARCH" != "win32" -a "$ARCH" != "psp" ]; then	71	if [ "$ARCH" != "win32" -a "$ARCH" != "psp" ]; then
72	# try to run X	72	# default, enable X support
73	X -version >/dev/null 2>&1	73	X11="true"
74		74
75	# X queried successfully	75	# attempt auto-detection
76	if [ "$?" = "0" ]; then	76	if [ "$4" = "" ]; then
		77	# try to run X
		78	X -version >/dev/null 2>&1
		79
		80	# X queried successfully
		81	if [ "$?" != "0" ]; then
		82	X11="false"
		83	fi
		84	fi
		85
		86	# don't autodetect, force off
		87	if [ "$4" = "-nox11" ]; then
		88	X11="false"
		89	fi
		90
		91	# asked for X11?
		92	if [ "$X11" = "true" ]; then
77	# enable the C++ bits	93	# enable the C++ bits
78	echo "#define CONFIG_X11" >> src/config.h	94	echo "#define CONFIG_X11" >> src/config.h
79		95
Lines 88-90 Link Here
88	fi	104	fi
89		105
90	echo "All done!"	106	echo "All done!"
		107

Lines 2-7 Link Here

(-)mzx281d/arch/Makefile.dist (-3 / +16 lines)
2		2
3	all:	3	all:
4	@echo "Please run config.sh before make!"	4	@echo "Please run config.sh before make!"
5	@echo "usage: ./config.sh <linux\|win32\|macos> <prefix> <sysconfdir>"	5	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
6	@echo " e.g.: ./config.sh linux /usr /etc"	6	@echo
7	@echo " e.g.: ./config.sh win32"	7	@echo "Supported <platform> values:"
		8	@echo
		9	@echo " win32 Microsoft Windows"
		10	@echo " linux Linux"
		11	@echo " macos Macintosh OS X (not Classic)"
		12	@echo " linux-static Linux (statically linked)"
		13	@echo
		14	@echo "Supported <option> values:"
		15	@echo " -nox11 Disables X11, removing binary dependency."
		16	@echo " -x11 Forces X11 support, even if 'X' isn't found."
		17	@echo
		18	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
		19	@echo "e.g.: ./config.sh win32"
		20	@echo

Lines 2-7 Link Here

(-)mzx281d/Makefile.platform (-3 / +16 lines)
2		2
3	all:	3	all:
4	@echo "Please run config.sh before make!"	4	@echo "Please run config.sh before make!"
5	@echo "usage: ./config.sh <linux\|win32\|macos> <prefix> <sysconfdir>"	5	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
6	@echo " e.g.: ./config.sh linux /usr /etc"	6	@echo
7	@echo " e.g.: ./config.sh win32"	7	@echo "Supported <platform> values:"
		8	@echo
		9	@echo " win32 Microsoft Windows"
		10	@echo " linux Linux"
		11	@echo " macos Macintosh OS X (not Classic)"
		12	@echo " linux-static Linux (statically linked)"
		13	@echo
		14	@echo "Supported <option> values:"
		15	@echo " -nox11 Disables X11, removing binary dependency."
		16	@echo " -x11 Forces X11 support, even if 'X' isn't found."
		17	@echo
		18	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
		19	@echo "e.g.: ./config.sh win32"
		20	@echo