config.lib
author peter1138
Sun, 17 Jun 2007 10:47:30 +0000
changeset 6924 f2ac2b1f5d06
parent 6918 43b7ded86b20
child 6929 56470c1b8a66
permissions -rw-r--r--
(svn r10177) -Fix: Passengers has one A and two Es (ln)
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     2
log() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     3
	if [ $1 = "1" ]; then echo "$2"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     4
	echo "$2" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     5
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     6
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     7
set_default() {
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
     8
	released_version=""
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
     9
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    10
	ignore_extra_parameters="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    11
	# We set all kinds of defaults for params. Later on the user can override
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    12
	# most of them; but if they don't, this default is used.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    13
	build=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    14
	host=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    15
	cc_build=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    16
	cc_host=""
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
    17
	cxx_build=""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    18
	cxx_host=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    19
	windres=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    20
	strip=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    21
	lipo=""
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
    22
	awk="awk"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    23
	os="DETECT"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    24
	endian="AUTO"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    25
	revision=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    26
	config_log="config.log"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    27
	prefix_dir="/usr/local"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    28
	binary_dir="games"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    29
	data_dir="share/games/openttd"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    30
	icon_dir="share/pixmaps"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    31
	personal_dir=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    32
	custom_lang_dir=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    33
	second_data_dir=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    34
	install_dir="/"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    35
	enable_install="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    36
	enable_debug="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    37
	enable_profiling="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    38
	enable_dedicated="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    39
	enable_network="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    40
	enable_static="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    41
	enable_translator="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    42
	enable_assert="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    43
	enable_strip="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    44
	enable_universal="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    45
	enable_osx_g5="0"
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
    46
	enable_unicode="1"
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
    47
	with_distcc="1"
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
    48
	with_ccache="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    49
	with_osx_sysroot="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    50
	with_application_bundle="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    51
	with_sdl="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    52
	with_cocoa="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    53
	with_zlib="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    54
	with_png="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    55
	with_makedepend="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    56
	with_direct_music="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    57
	with_sort="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    58
	with_iconv="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    59
	with_midi=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    60
	with_midi_arg=""
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
    61
	with_libtimidity="1"
5578
5f898d0bfebd (svn r8019) -Fix (r7759): if libfreetype was not found (and not forced to be used), the configure script aborted instead of marking it a 'not found'.
rubidium
parents: 5560
diff changeset
    62
	with_freetype="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    63
	with_fontconfig="1"
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
    64
	with_psp_config="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    65
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
    66
	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_ccache with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    67
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    68
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    69
detect_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    70
	# Walk over all params from the user and override any default settings if
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    71
	#  needed. This also handles any invalid option.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
    72
	for p in "$@"; do
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
    73
		if [ -n "$prev_p" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    74
			eval "$prev_p=\$p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    75
			prev_p=
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    76
			continue
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    77
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    78
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    79
		optarg=`expr "x$p" : 'x[^=]*=\(.*\)'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    80
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    81
		case "$p" in
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    82
			--help | -h)                  showhelp; exit 0;;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    83
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    84
			--config-log)                 prev_p="config_log";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    85
			--config-log=*)               config_log="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    86
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    87
			--build)                      prev_p="build";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    88
			--build=*)                    build="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    89
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    90
			--host)                       prev_p="host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    91
			--host=*)                     host="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    92
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    93
			--os)                         prev_p="os";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    94
			--os=*)                       os="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    95
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    96
			--revision=*)                 revision="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    97
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    98
			--cc-build)                   prevp_p="cc_build";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
    99
			--cc-build=*)                 cc_build="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   100
			--cc-host)                    prevp_p="cc_host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   101
			--cc-host=*)                  cc_host="$optarg";;
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   102
			--cxx-build)                  prevp_p="cxx_build";;
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   103
			--cxx-build=*)                cxx_build="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   104
			--cxx-host)                   prevp_p="cxx_host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   105
			--cxx-host=*)                 cxx_host="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   106
			--windres)                    prevp_p="windres";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   107
			--windres=*)                  windres="$optarg";;
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   108
			--awk)                        prevp_p="awk";;
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   109
			--awk=*)                      awk="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   110
			--strip)                      prevp_p="strip";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   111
			--strip=*)                    strip="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   112
			--lipo)                       prevp_p="lipo";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   113
			--lipo=*)                     lipo="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   114
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   115
			--endian)                     prev_p="endian";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   116
			--endian=*)                   endian="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   117
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   118
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   119
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   120
			--prefix-dir)                 prevp_p="prefix-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   121
			--prefix-dir=*)               prefix_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   122
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   123
			--binary-dir)                 prevp_p="binary-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   124
			--binary-dir=*)               binary_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   125
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   126
			--data-dir)                   prevp_p="data-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   127
			--data-dir=*)                 data_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   128
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   129
			--icon-dir)                   prevp_p="icon-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   130
			--icon-dir=*)                 icon_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   131
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   132
			--personal-dir)               prevp_p="personal-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   133
			--personal-dir=*)             personal_dir="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   134
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   135
			--install-dir)                prevp_p="install-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   136
			--install-dir=*)              install_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   137
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   138
# TODO: The next few cases will be removed when the search path patch is applied
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   139
			--custom-lang-dir)            prevp_p="custom-lang-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   140
			--custom-lang-dir=*)          custom_lang_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   141
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   142
			--second-data-dir)            prevp_p="second-data-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   143
			--second-data-dir=*)          second_data_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   144
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   145
			--enable-install)             enable_install="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   146
			--enable-install=*)           enable_install="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   147
# TODO: End of to be removed cases
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   148
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   149
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   150
			--enable-debug)               enable_debug="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   151
			--enable-debug=*)             enable_debug="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   152
			--enable-profiling)           enable_profiling="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   153
			--enable-profiling=*)         enable_profiling="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   154
			--enable-dedicated)           enable_dedicated="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   155
			--enable-dedicated=*)         enable_dedicated="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   156
			--enable-network=*)           enable_network="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   157
			--disable-network)            enable_network="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   158
			--disable-static)             enable_static="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   159
			--enable-static)              enable_static="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   160
			--enable-static=*)            enable_static="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   161
			--disable-translator)         enable_translator="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   162
			--enable-translator)          enable_translator="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   163
			--enable-translator=*)        enable_translator="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   164
			--disable-assert)             enable_assert="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   165
			--enable-assert)              enable_assert="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   166
			--enable-assert=*)            enable_assert="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   167
			--disable-strip)              enable_strip="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   168
			--enable-strip)               enable_strip="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   169
			--enable-strip=*)             enable_strip="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   170
			--disable-universal)          enable_universal="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   171
			--enable-universal)           enable_universal="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   172
			--enable-universal=*)         enable_universal="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   173
			--disable-osx-g5)             enable_osx_g5="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   174
			--enable-osx-g5)              enable_osx_g5="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   175
			--enable-osx-g5=*)            enable_osx_g5="$optarg";;
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   176
			--disable-unicode)            enable_unicode="0";;
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   177
			--enable-unicode)             enable_unicode="2";;
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   178
			--enable-unicode=*)           enable_unicode="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   179
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   180
			--with-sdl)                   with_sdl="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   181
			--without-sdl)                with_sdl="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   182
			--with-sdl=*)                 with_sdl="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   183
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   184
			--with-cocoa)                 with_cocoa="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   185
			--without-cocoa)              with_cocoa="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   186
			--with-cocoa=*)               with_cocoa="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   187
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   188
			--with-zlib)                  with_zlib="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   189
			--without-zlib)               with_zlib="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   190
			--with-zlib=*)                with_zlib="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   191
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   192
			--with-png)                   with_png="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   193
			--without-png)                with_png="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   194
			--with-png=*)                 with_png="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   195
			--with-libpng)                with_png="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   196
			--without-libpng)             with_png="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   197
			--with-libpng=*)              with_png="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   198
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   199
			--with-libtimidity)           with_libtimidity="2";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   200
			--without-libtimidity)        with_libtimidity="0";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   201
			--with-libtimidity=*)         with_libtimidity="$optarg";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   202
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   203
			--with-freetype)              with_freetype="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   204
			--without-freetype)           with_freetype="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   205
			--with-freetype=*)            with_freetype="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   206
			--with-libfreetype)           with_freetype="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   207
			--without-libfreetype)        with_freetype="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   208
			--with-libfreetype=*)         with_freetype="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   209
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   210
			--with-fontconfig)            with_fontconfig="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   211
			--without-fontconfig)         with_fontconfig="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   212
			--with-fontconfig=*)          with_fontconfig="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   213
			--with-libfontconfig)         with_fontconfig="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   214
			--without-libfontconfig)      with_fontconfig="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   215
			--with-libfontconfig=*)       with_fontconfig="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   216
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   217
			--with-psp-config)            with_psp_config="2";;
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   218
			--without-psp-config)         with_psp_config="0";;
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   219
			--with-psp-config=*)          with_psp_config="$optarg";;
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
   220
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   221
			--with-makedepend)            with_makedepend="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   222
			--without-makedepend)         with_makedepend="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   223
			--with-makedepend=*)          with_makedepend="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   224
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   225
			--with-direct-music)          with_direct_music="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   226
			--without-direct-music)       with_direct_music="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   227
			--with-direct-music=*)        with_direct_music="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   228
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   229
			--with-sort)                  with_sort="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   230
			--without-sort)               with_sort="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   231
			--with-sort=*)                with_sort="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   232
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   233
			--with-iconv)                 with_iconv="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   234
			--without-iconv)              with_iconv="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   235
			--with-iconv=*)               with_iconv="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   236
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   237
			--with-midi=*)                with_midi="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   238
			--with-midi-arg=*)            with_midi_arg="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   239
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   240
			--without-distcc)             with_distcc="0";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   241
			--with-distcc)                with_distcc="2";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   242
			--with-distcc=*)              with_distcc="$optarg";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   243
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   244
			--without-ccache)             with_ccache="0";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   245
			--with-ccache)                with_ccache="2";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   246
			--with-ccache=*)              with_ccache="$optarg";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   247
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   248
			--without-osx-sysroot)        with_osx_sysroot="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   249
			--with-osx-sysroot)           with_osx_sysroot="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   250
			--with-osx-sysroot=*)         with_osx_sysroot="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   251
6512
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   252
			--without-application-bundle) with_application_bundle="0";;
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   253
			--with-application-bundle)    with_application_bundle="1";;
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   254
			--with-application-bundle=*)  with_application_bundle="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   255
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   256
			CC=* | --CC=*)                CC="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   257
			CXX=* | --CXX=*)              CXX="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   258
			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   259
			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   260
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   261
			--ignore-extra-parameters)    ignore_extra_parameters="1";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   262
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   263
			--*)
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   264
				if [ "$ignore_extra_parameters" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   265
					echo "Unknown option $p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   266
					exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   267
				else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   268
					echo "Unknown option $p ignored"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   269
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   270
				;;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   271
		esac
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   272
	done
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   273
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   274
	if [ -n "$prev_p" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   275
		echo "configure: error: missing argument to --$prev_p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   276
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   277
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   278
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   279
	# Clean the logfile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   280
	echo "" > $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   281
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   282
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   283
save_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   284
	# Here we save all params, so we can later on do an exact redo of this
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   285
	#  configuration, without having the user to re-input stuff
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   286
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   287
	echo "Running configure with following options:" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   288
	echo "" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   289
6246
75451000349d (svn r9049) -Fix [Config]: when running 'bash configure', make sure automated reconfigures run 'bash configure' too.
truelight
parents: 6244
diff changeset
   290
	configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   291
	for p in $save_params_array; do
5560
94d98c7015ce (svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents: 5559
diff changeset
   292
		eval "v=\"\$$p\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   293
		p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   294
		# Only save those params that aren't empty
5560
94d98c7015ce (svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents: 5559
diff changeset
   295
		configure="$configure --$p=\"$v\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   296
	done
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   297
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   298
	echo "$configure" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   299
	echo "$configure" > config.cache
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   300
	echo "" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   301
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   302
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   303
check_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   304
	# Some params want to be in full uppercase, else they might not work as
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   305
	# expected.. fix that here
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   306
6078
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   307
	endian=`echo $endian | tr '[a-z]' '[A-Z]'`
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   308
	os=`echo $os | tr '[a-z]' '[A-Z]'`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   309
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   310
	# Check if all params have valid values
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   311
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   312
	# Endian only allows AUTO, LE and, BE
6080
3148f3835e18 (svn r8813) -Fix r8812: fixed one GNU depending grep statement with an other ;) Switched to egrep, which should work just fine.
truelight
parents: 6079
diff changeset
   313
	if [ -z "`echo $endian | egrep '^(AUTO|LE|BE)$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   314
		echo "configure: error: invalid option --endian=$endian"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   315
		echo " Available options are: --endian=[AUTO|LE|BE]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   316
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   317
	fi
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   318
	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   319
	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   320
		echo "configure: error: invalid option --os=$os"
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   321
		echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   322
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   323
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   324
	# enable_debug should be between 0 and 4
6079
d9fc487d06fd (svn r8812) -Revert r7880: those changes assumed a GNU-grep, which isn't always available. Reverted back to a bit more ugly way of writing greps, but at least they are not bound to the laws of GNU.
truelight
parents: 6078
diff changeset
   325
	if [ -z "`echo $enable_debug | grep '^[0123]$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   326
		echo "configure: error: invalid option --enable-debug=$enable_debug"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   327
		echo " Available options are: --enable-debug[=0123]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   328
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   329
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   330
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   331
	detect_awk
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   332
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   333
	check_build
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   334
	check_host
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   335
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   336
	detect_os
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   337
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   338
# We might enable universal builds always on OSX targets.. but currently we don't
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   339
#	if [ "$enable_universal" = "1" ]  && [ "$os" != "OSX" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   340
	if [ "$enable_universal" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   341
		enable_universal="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   342
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   343
	if [ "$enable_universal" = "2" ]  && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   344
		log 1 "configure: error: --enable-universal only works on OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   345
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   346
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   347
	if [ "$enable_universal" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   348
		log 1 "checking universal build... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   349
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   350
		log 1 "checking universal build... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   351
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   352
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   353
	# Already detected by check_build
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   354
	log 1 "checking build cc... $cc_build"
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   355
	log 1 "checking host cc... $cc_host"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   356
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   357
	check_cxx_build
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   358
	check_cxx_host
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   359
	check_windres
6082
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   360
	if [ "$enable_strip" != "0" ]; then
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   361
		check_strip
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   362
	else
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   363
		log 1 "checking strip... disabled"
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   364
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   365
	check_lipo
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   366
	check_makedepend
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   367
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   368
	if [ "$enable_static" = "1" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   369
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   370
			enable_static="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   371
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   372
			enable_static="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   373
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   374
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   375
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   376
	if [ "$enable_static" != "0" ]; then
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   377
		log 1 "checking static... yes"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   378
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   379
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   380
			log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   381
			log 1 "WARNING: use static at your own risk on this platform"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   382
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   383
			sleep 5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   384
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   385
	else
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   386
		log 1 "checking static... no"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   387
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   388
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   389
	if [ "$enable_unicode" = "1" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   390
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   391
			enable_unicode="2"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   392
		else
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   393
			enable_unicode="0"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   394
		fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   395
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   396
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   397
	if [ "$enable_unicode" != "0" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   398
		log 1 "checking unicode... yes"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   399
	else
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   400
		log 1 "checking unicode... no"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   401
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   402
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   403
	# Show what we configured
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   404
	if [ "$enable_debug" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   405
		log 1 "using debug level... no"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   406
	elif [ "$enable_profiling" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   407
		log 1 "using debug level... profiling (debug level $enable_debug)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   408
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   409
		log 1 "using debug level... level $enable_debug"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   410
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   411
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   412
	detect_sdl
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   413
	detect_cocoa
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   414
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   415
	if [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   416
		log 1 "checking GDI video driver... skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   417
		log 1 "checking dedicated... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   418
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   419
		if [ "$enable_network" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   420
			log 1 "WARNING: compiling a dedicated server without network is pointless"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   421
			sleep 5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   422
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   423
	else
5760
483b8c081776 (svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents: 5753
diff changeset
   424
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   425
			log 1 "checking GDI video driver... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   426
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   427
			log 1 "checking GDI video driver... not Windows, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   428
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   429
5760
483b8c081776 (svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents: 5753
diff changeset
   430
		if [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   431
			log 1 "WARNING: no video driver found, building dedicated only"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   432
			enable_dedicated="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   433
			sleep 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   434
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   435
			log 1 "checking dedicated... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   436
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   437
			log 1 "checking dedicated... not selected"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   438
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   439
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   440
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   441
	if [ "$enable_network" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   442
		log 1 "checking network... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   443
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   444
		log 1 "checking network... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   445
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   446
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   447
	if [ "$enable_translator" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   448
		log 1 "checking translator... debug"
5485
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   449
		# -t shows TODO items, normally they are muted
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   450
		strgen_flags="-t"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   451
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   452
		log 1 "checking translator... no"
5485
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   453
		strgen_flags=""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   454
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   455
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   456
	if [ "$enable_assert" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   457
		log 1 "checking assert... enabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   458
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   459
		log 1 "checking assert... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   460
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   461
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   462
	detect_zlib
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   463
	detect_png
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   464
	detect_freetype
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   465
	detect_fontconfig
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   466
	detect_iconv
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
   467
	detect_pspconfig
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   468
	detect_libtimidity
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   469
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   470
	if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   471
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   472
			if [ "$with_direct_music" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   473
				log 1 "configure: error: direct-music is only supported on Win32 targets"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   474
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   475
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   476
			with_direct_music="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   477
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   478
			log 1 "checking direct-music... not Windows, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   479
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   480
			check_direct_music
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   481
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   482
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   483
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   484
	detect_sort
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   485
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   486
	if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   487
		endian="PREPROCESSOR"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   488
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   489
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   490
	log 1 "checking endianess... $endian"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   491
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   492
	# Suppress language errors when there is a version defined, indicating a release
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   493
	#  It just isn't pretty if any release produces warnings in the languages.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   494
	if [ -f "$ROOT_DIR/version" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   495
		lang_suppress="yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   496
		log 1 "suppress language errors... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   497
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   498
		lang_suppress=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   499
		log 1 "suppress language errors... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   500
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   501
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   502
	if [ "$enable_debug" = "0" ] && [ "$enable_profiling" = "0" ] && [ "$enable_strip" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   503
		if [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   504
			strip_arg="--strip-all --strip-unneeded --remove-section .comment"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   505
		elif [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   506
			strip_arg=""
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   507
		elif [ "$os" = "OS2" ]; then
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   508
			strip_arg=""
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   509
			# OS2 uses strip via gcc, because it needs to be feed to emxbind
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   510
			LDFLAGS="$LDFLAGS -s"
6230
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   511
		elif [ "$os" = "SUNOS" ]; then
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   512
			# The GNU strip does know -s, the non-GNU doesn't
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   513
			#  So try to detect it (in a bit of an ugly way)
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   514
			strip_arg="`$strip -s strip.test 2>/dev/null && echo \"-s\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   515
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   516
			strip_arg="-s"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   517
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   518
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   519
		log 1 "checking stripping... $strip $strip_arg"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   520
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   521
		strip=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   522
		log 1 "checking stripping... skipped"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   523
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   524
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   525
	if [ "$with_distcc" = "0" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   526
		log 1 "checking distcc... no"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   527
	elif [ "$with_distcc" = "1" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   528
		with_distcc="0"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   529
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   530
		log 1 "checking distcc... no (only used when forced)"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   531
	elif [ "$with_distcc" = "2" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   532
		distcc="distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   533
	else
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   534
		distcc="$with_distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   535
	fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   536
	if [ "$with_distcc" != "0" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   537
		res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   538
		if [ "$res" != "distcc" ]; then
6851
0a0a094fb9f1 (svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
rubidium
parents: 6850
diff changeset
   539
			distcc=""
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   540
			log 1 "checking distcc... no"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   541
			if [ "$with_distcc" = "2" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   542
				log 1 "configure: error: no distcc detected, but was forced to be used"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   543
				exit 1
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   544
			fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   545
			if [ "$with_distcc" != "1" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   546
				log 1 "configure: error: '$with_distcc' doesn't seem a distcc to me"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   547
				exit 1
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   548
			fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   549
		fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   550
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   551
		log 1 "checking distcc... $distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   552
	fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   553
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   554
	if [ "$with_ccache" = "0" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   555
		log 1 "checking ccache... no"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   556
	elif [ "$with_ccache" = "1" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   557
		with_ccache="0"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   558
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   559
		log 1 "checking ccache... no (only used when forced)"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   560
	elif [ "$with_ccache" = "2" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   561
		ccache="ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   562
	else
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   563
		ccache="$with_ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   564
	fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   565
	if [ "$with_ccache" != "0" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   566
		res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 0-6`"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   567
		if [ "$res" != "ccache" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   568
			ccache=""
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   569
			log 1 "checking ccache... no"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   570
			if [ "$with_ccache" = "2" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   571
				log 1 "configure: error: no ccache detected, but was forced to be used"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   572
				exit 1
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   573
			fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   574
			if [ "$with_ccache" != "1" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   575
				log 1 "configure: error: '$with_ccache' doesn't seem a ccache to me"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   576
				exit 1
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   577
			fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   578
		fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   579
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   580
		log 1 "checking ccache... $ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   581
	fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   582
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   583
	if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   584
		if [ "$with_osx_sysroot" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   585
			with_osx_sysroot="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   586
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   587
			log 1 "checking OSX sysroot... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   588
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   589
			log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   590
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   591
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   592
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   593
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   594
	if [ "$with_osx_sysroot" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   595
		if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   596
			log 1 "checking OSX sysroot... $with_osx_sysroot"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   597
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   598
			# If autodetect and no universal, use system default
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   599
			if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   600
				log 1 "checking OSX sysroot... no (use system default)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   601
				with_osx_sysroot="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   602
			else
5541
f034f6f60d88 (svn r7883) It's spelled 'automatically'
tron
parents: 5539
diff changeset
   603
				log 1 "checking OSX sysroot... automatically"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   604
				with_osx_sysroot="3"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   605
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   606
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   607
	else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   608
		if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   609
			log 1 "checking OSX sysroot... no (use system default)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   610
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   611
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   612
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   613
	if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   614
		if [ "$with_application_bundle" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   615
			with_application_bundle="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   616
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   617
			log 1 "checking OSX application bundle... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   618
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   619
			log 1 "configure: error: --with-application-bundle only works if OSX is the target"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   620
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   621
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   622
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   623
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   624
	if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   625
		OSXAPP="OpenTTD.app"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   626
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   627
# TODO: remove next few lines of code when the search path patch has been applied
6300
e5f3c62b3971 (svn r9131) -Codechange: move the OSX application bundle resource directories so they comply (better) to Apple's guidelines and to our naming 'scheme' for the lang and data directories.
rubidium
parents: 6249
diff changeset
   628
		if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "${OSXAPP}/Contents/Resources/lang/" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   629
			log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   630
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   631
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   632
6300
e5f3c62b3971 (svn r9131) -Codechange: move the OSX application bundle resource directories so they comply (better) to Apple's guidelines and to our naming 'scheme' for the lang and data directories.
rubidium
parents: 6249
diff changeset
   633
		if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Resources/data/" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   634
			log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   635
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   636
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   637
6300
e5f3c62b3971 (svn r9131) -Codechange: move the OSX application bundle resource directories so they comply (better) to Apple's guidelines and to our naming 'scheme' for the lang and data directories.
rubidium
parents: 6249
diff changeset
   638
		custom_lang_dir="${OSXAPP}/Contents/Resources/lang/"
e5f3c62b3971 (svn r9131) -Codechange: move the OSX application bundle resource directories so they comply (better) to Apple's guidelines and to our naming 'scheme' for the lang and data directories.
rubidium
parents: 6249
diff changeset
   639
		second_data_dir="${OSXAPP}/Contents/Resources/data/"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   640
# TODO: remove till here
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   641
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   642
		OSXAPP=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   643
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   644
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   645
	if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   646
		# Test on G5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   647
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   648
		if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   649
			log 1 "detecting G5... yes (forced)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   650
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   651
			# First, are we a real OSX system, else we can't detect it
6078
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   652
			native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   653
			# If $host doesn't match $build , we are cross-compiling
6312
738abf8f57a4 (svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).
rubidium
parents: 6300
diff changeset
   654
			if [ -n "$native" ] && [ "$build" == "$host" ]; then
738abf8f57a4 (svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).
rubidium
parents: 6300
diff changeset
   655
				$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   656
				res=`./G5_detector`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   657
				rm -f G5_detector
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   658
				if [ -n "$res" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   659
					# This is G5, add flags for it
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   660
					enable_osx_g5="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   661
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   662
					log 1 "detecting G5... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   663
				else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   664
					enable_osx_g5="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   665
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   666
					log 1 "detecting G5... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   667
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   668
			else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   669
				enable_osx_g5="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   670
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   671
				log 1 "detecting G5... no (cross-compiling)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   672
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   673
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   674
	else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   675
		if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   676
			log 1 "configure: error: OSX G5 selected, but not compiling for OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   677
			log 1 "configure: error: either select OSX as OS, or deselect OSX G5"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   678
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   679
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   680
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   681
	fi
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   682
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   683
	if [ -n "$released_version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   684
		log 1 "checking revision... release ($released_version)"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   685
		if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   686
			log 1 "WARNING: overriding of the revision is NOT possible for releases"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   687
			log 1 "WARNING: the given revision is IGNORED"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   688
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   689
			sleep 5
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   690
		fi
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   691
		revision=$released_version
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   692
	else
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   693
		if [ -n "$revision" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   694
			log 1 "checking revision... $revision"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   695
			log 1 "WARNING: we do not advise you to use this setting"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   696
			log 1 "WARNING: in most cases it is not safe for network use"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   697
			log 1 "WARNING: USE WITH CAUTION!"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   698
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   699
			sleep 5
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   700
		elif [ -f "$ROOT_DIR/version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   701
			revision="`cat $ROOT_DIR/version`"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   702
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   703
			log 1 "checking revision... $revision"
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   704
		elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help`" ]; then
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   705
			revision=""
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   706
			log 1 "checking revision... svn detection"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   707
		elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help`" ]; then
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   708
			revision=""
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   709
			log 1 "checking revision... git detection"
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   710
		else
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   711
			revision=""
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   712
			log 1 "checking revision... no detection"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   713
			log 1 "WARNING: there is no means to determine the version."
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   714
			log 1 "WARNING: please use a subversion or git checkout of OpenTTD."
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   715
			log 1 "WARNING: this version will be allowed by all game servers,"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   716
			log 1 "WARNING: but you will be kicked from all incompatible"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   717
			log 1 "WARNING: servers as you will desync."
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   718
			log 1 "WARNING: USE WITH CAUTION!"
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   719
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   720
			sleep 5
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   721
		fi
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   722
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   723
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   724
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   725
make_cflags_and_ldflags() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   726
	# General CFlags for BUILD
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   727
	CFLAGS_BUILD=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   728
	# General CFlags for HOST
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   729
	CFLAGS="$CFLAGS -D$os -DWITH_REV"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   730
	# CFlags for HOST and C-Compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   731
	CC_FLAGS=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   732
	# Libs to compile. In fact this is just LDFLAGS
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   733
	LIBS="-lstdc++"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   734
	# LDFLAGS used for HOST
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   735
	LDFLAGS="$LDFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   736
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   737
	if [ $enable_debug = 0 ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   738
		# No debug, add default stuff
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   739
		OBJS_SUBDIR="release"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   740
		if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   741
			# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   742
			CFLAGS="$CFLAGS -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   743
		else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   744
			if [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   745
				CFLAGS="$CFLAGS -I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   746
				CFLAGS="$CFLAGS -mcpu=604 -fno-inline -mstring -mmultiple"
6046
67e9b9e2ef98 (svn r8776) [MorhpOS] -Fix: LDFLAGS needs -noixemul too
truelight
parents: 6035
diff changeset
   747
				LDFLAGS="$LDFLAGS -noixemul"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   748
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   749
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   750
			CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   751
		fi
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   752
	else
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   753
		OBJS_SUBDIR="debug"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   754
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   755
		# Each debug level reduces the optimalization by a bit
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   756
		if [ $enable_debug -ge 1 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   757
			CFLAGS="$CFLAGS -g -D_DEBUG"
5979
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   758
			if [ "$os" = "PSP" ]; then
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   759
				CFLAGS="$CFLAGS -G0"
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   760
			fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   761
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   762
		if [ $enable_debug -ge 2 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   763
			CFLAGS="$CFLAGS -fno-inline"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   764
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   765
		if [ $enable_debug -ge 3 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   766
			CFLAGS="$CFLAGS -O0"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   767
		else
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   768
			CFLAGS="$CFLAGS -O2"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   769
		fi
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   770
	fi
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   771
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   772
	if [ "$enable_profiling" != "0" ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   773
		CFLAGS="$CFLAGS -p"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   774
		LDFLAGS="$LDFLAGS -pg"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   775
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   776
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   777
	# Enable some things only for certain GCC versions
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   778
	cc_version=`$cc_host -dumpversion | cut -c 1,3`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   779
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   780
	if [ $cc_version -ge 29 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   781
		CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   782
		CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   783
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   784
		CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   785
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   786
6523
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   787
	gcc295=""
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   788
	if [ "$cc_version" = 29 ]; then
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   789
		# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   790
		#  need a lovely hack there to make it compile correctly.
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   791
		gcc295="1"
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   792
	fi
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
   793
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   794
	if [ $cc_version -ge 30 ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   795
		CFLAGS="$CFLAGS -W -Wno-unused-parameter"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   796
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   797
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   798
	if [ $cc_version -ge 34 ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   799
		CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   800
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   801
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   802
	if [ "$os" = "CYGWIN" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   803
		CFLAGS="$CFLAGS -mwin32"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   804
		LDFLAGS="$LDFLAGS -mwin32"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   805
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   806
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   807
		CFLAGS="$CFLAGS -mno-cygwin"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   808
		LDFLAGS="$LDFLAGS -mno-cygwin"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   809
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   810
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   811
	if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   812
		LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   813
		LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
6191
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   814
		# GCC 4.0+ complains about that we break strict-aliasing.
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   815
		#  On most places we don't see how to fix it, and it doesn't
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   816
		#  break anything. So disable strict-aliasing to make the
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   817
		#  compiler all happy.
6189
7418216ee28a (svn r8968) -Fix (win32): silent g++ 4.0+ warnings about breaking strict-aliasing
truelight
parents: 6082
diff changeset
   818
		if [ $cc_version -ge 40 ]; then
7418216ee28a (svn r8968) -Fix (win32): silent g++ 4.0+ warnings about breaking strict-aliasing
truelight
parents: 6082
diff changeset
   819
			CFLAGS="$CFLAGS -fno-strict-aliasing"
7418216ee28a (svn r8968) -Fix (win32): silent g++ 4.0+ warnings about breaking strict-aliasing
truelight
parents: 6082
diff changeset
   820
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   821
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   822
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   823
	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   824
		LIBS="$LIBS -lpthread"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   825
		LIBS="$LIBS -lrt"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   826
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   827
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
   828
	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   829
		LIBS="$LIBS -lc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   830
	fi
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
   831
	if [ "$os" = "WINCE" ]; then
5762
f7f13553f881 (svn r8313) [WinCE] -Fix: -lws2 wasn't included in libraries, so network couldn't be linked
truelight
parents: 5760
diff changeset
   832
		LIBS="$LIBS -lcoredll -lcorelibc -laygshell -lws2 -e WinMainCRTStartup"
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
   833
	fi
5960
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
   834
	if [ "$os" = "PSP" ]; then
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
   835
		CFLAGS="$CFLAGS -I`$psp_config -p`/include"
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
   836
		LDFLAGS="$LDFLAGS -L`$psp_config -p`/lib"
5979
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   837
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   838
		CFLAGS="$CFLAGS -fno-exceptions -fno-rtti -D_PSP_FW_VERSION=150"
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
   839
		LIBS="$LIBS -D_PSP_FW_VERSION=150 -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser -lpspkernel -lm"
5960
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
   840
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   841
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   842
	if [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   843
		# -Wstrict-prototypes generates much noise because of system headers
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   844
		CFLAGS="$CFLAGS -Wno-strict-prototypes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   845
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   846
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   847
	if [ "$os" = "OPENBSD" ]; then
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   848
		LIBS="$LIBS -pthread"
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   849
	fi
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   850
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   851
	if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   852
		LDFLAGS="$LDFLAGS -framework Cocoa"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   853
		if [ "$enable_dedicated" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   854
			LIBS="$LIBS -framework QuickTime"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   855
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   856
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   857
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   858
	if [ "$os" = "BEOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   859
		LIBS="$LIBS -lmidi -lbe"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   860
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   861
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   862
	# Most targets act like UNIX, just with some additions
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   863
	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   864
		CFLAGS="$CFLAGS -DUNIX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   865
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   866
	# And others like Windows
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
   867
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   868
		CFLAGS="$CFLAGS -DWIN"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   869
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   870
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   871
	if [ -n "$sdl_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   872
		CFLAGS="$CFLAGS -DWITH_SDL"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   873
		CFLAGS="$CFLAGS `$sdl_config --cflags`"
6249
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   874
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   875
			if [ "$enable_static" != "0" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   876
				LIBS="$LIBS `$sdl_config --static-libs`"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   877
			else
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   878
				LIBS="$LIBS `$sdl_config --libs`"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
   879
			fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   880
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   881
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   882
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   883
	if [ "$with_cocoa" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   884
		CFLAGS="$CFLAGS -DWITH_COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   885
		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   886
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   887
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   888
	if [ "$with_zlib" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   889
		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   890
			LIBS="$LIBS $zlib"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   891
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   892
			LIBS="$LIBS -lz"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   893
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   894
		CFLAGS="$CFLAGS -DWITH_ZLIB"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   895
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   896
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   897
	if [ -n "$png_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   898
		CFLAGS="$CFLAGS -DWITH_PNG"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   899
		CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   900
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   901
		# The extra flags are unneeded for latest libpng-config, but some versions are so broken...
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   902
		if [ "$enable_static" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   903
			if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   904
				LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   905
			else
6242
cd6bbee8f290 (svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents: 6241
diff changeset
   906
				LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' '  '`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   907
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   908
		else
6242
cd6bbee8f290 (svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents: 6241
diff changeset
   909
			LIBS="$LIBS `$png_config --ldflags | tr '\n\r' '  '`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   910
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   911
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   912
6241
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   913
	if [ -n "$fontconfig_config" ]; then
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   914
		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   915
		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   916
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   917
		if [ "$enable_static" != "0" ]; then
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   918
			if [ "$os" = "OSX" ]; then
6243
80b367ea1679 (svn r9046) -Fix r9041: added a comment to make clear why we don't use --prefix here
truelight
parents: 6242
diff changeset
   919
				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
6244
14efce228eae (svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents: 6243
diff changeset
   920
				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
14efce228eae (svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents: 6243
diff changeset
   921
				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`"
6241
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   922
			else
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   923
				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   924
			fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   925
		else
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   926
			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   927
		fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   928
	fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
   929
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   930
	if [ -n "$freetype_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   931
		CFLAGS="$CFLAGS -DWITH_FREETYPE"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   932
		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   933
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   934
		if [ "$enable_static" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   935
			if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   936
				LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   937
			else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   938
				# Is it possible to do static with freetype, if so: how?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   939
				LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   940
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   941
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   942
			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   943
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   944
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   945
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   946
	if [ "$with_direct_music" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   947
		CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
6191
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   948
		# GCC 4.0+ doesn't like the DirectX includes (gives tons of
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   949
		#  warnings on it we won't be able to fix). For now just
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   950
		#  suppress those warnings.
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   951
		if [ $cc_version -ge 40 ]; then
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   952
			CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
   953
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   954
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   955
6035
9009f472b356 (svn r8758) -Fix r8757: wrong variable to check libtimidity on if it is found or not
truelight
parents: 6034
diff changeset
   956
	if [ -n "$libtimidity" ]; then
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   957
		if [ "$enable_static" != "0" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   958
			LIBS="$LIBS $libtimidity"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   959
		else
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   960
			LIBS="$LIBS -ltimidity"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   961
		fi
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   962
		CFLAGS="$CFLAGS -DLIBTIMIDITY"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   963
	fi
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   964
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   965
	if [ "$with_iconv" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   966
		CFLAGS="$CFLAGS -DWITH_ICONV"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   967
		LIBS="$LIBS -liconv"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   968
		if [ "$with_iconv" != "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   969
			CFLAGS="$CFLAGS -I$with_iconv/include"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   970
			LIBS="$LIBS -L$with_iconv/lib"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   971
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   972
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   973
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   974
	if [ -n "$with_midi" ]; then
5549
85d90ea63b6f (svn r7922) -Fix: bad escaping in CFLAGS
glx
parents: 5541
diff changeset
   975
		CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   976
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   977
	if [ -n "$with_midi_arg" ]; then
5549
85d90ea63b6f (svn r7922) -Fix: bad escaping in CFLAGS
glx
parents: 5541
diff changeset
   978
		CFLAGS="$CFLAGS -DMIDI_ARG=\\\\\"$with_midi_arg\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   979
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   980
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   981
	if [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   982
		CFLAGS="$CFLAGS -DDEDICATED"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   983
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   984
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   985
	if [ "$enable_unicode" != "0" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   986
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   987
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   988
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   989
	if [ "$enable_network" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   990
		CFLAGS="$CFLAGS -DENABLE_NETWORK"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   991
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   992
		if [ "$os" = "BEOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   993
			LDFLAGS="$LDFLAGS -lbind -lsocket"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   994
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   995
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   996
		if [ "$os" = "SUNOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   997
			LDFLAGS="$LDFLAGS -lnsl -lsocket"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   998
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   999
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1000
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1001
	if [ "$enable_static" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1002
		# OSX can't handle -static in LDFLAGS
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1003
		if [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1004
			LDFLAGS="$LDFLAGS -static"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1005
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1006
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1007
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1008
	if [ "$enable_assert" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1009
		CFLAGS="$CFLAGS -DNDEBUG"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1010
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1011
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1012
	if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1013
		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1014
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1015
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1016
	if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1017
		CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1018
		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1019
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1020
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1021
# TODO: remove next few lines of code when the search path patch has been applied
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1022
	if [ -n "$second_data_dir" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1023
		CFLAGS="$CFLAGS -DSECOND_DATA_DIR=\\\\\"$second_data_dir\\\\\""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1024
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1025
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1026
	if [ -n "$custom_lang_dir" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1027
		CFLAGS="$CFLAGS -DCUSTOM_LANG_DIR=\\\\\"$custom_lang_dir\\\\\""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1028
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1029
# TODO: remove till here
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1030
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1031
	if [ "$enable_install" = "1" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1032
		if [ -n "$personal_dir" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1033
			CFLAGS="$CFLAGS -DUSE_HOMEDIR=1 -DPERSONAL_DIR=\\\\\"$personal_dir/\\\\\""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1034
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1035
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1036
		if [ -n "$data_dir" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1037
			CFLAGS="$CFLAGS -DGAME_DATA_DIR=\\\\\"$prefix_dir/$data_dir/\\\\\""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1038
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1039
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1040
		if [ -n "$icon_dir" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1041
			CFLAGS="$CFLAGS -DICON_DIR=\\\\\"$prefix_dir/$icon_dir/\\\\\""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1042
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1043
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1044
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1045
	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1046
	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1047
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1048
	# Makedepend doesn't like something like: -isysroot /OSX/blabla
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1049
	#  so convert it to: -isysroot -OSX/blabla. makedepend just ignores
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1050
	#  any - command it doesn't know, so we are pretty save.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1051
	# Lovely hackish, not?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1052
	# Btw, this almost always comes from outside the configure, so it is
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1053
	#  not something we can control.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1054
	if [ "$with_makedepend" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1055
		cflags_makedep="` echo "$CFLAGS" | sed 's# /# -#g'`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1056
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1057
		makedepend=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1058
	fi
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1059
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1060
	if [ "$with_distcc" != "0" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1061
		cc_host="$distcc $cc_host"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1062
		cxx_host="$distcc $cxx_host"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1063
		log 1 ""
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1064
		log 1 " NOTICE: remind yourself to use 'make -jN' to make use of distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1065
		log 1 ""
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1066
	fi
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1067
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1068
	if [ "$with_ccache" != "0" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1069
		cc_host="$ccache $cc_host"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1070
		cxx_host="$ccache $cxx_host"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1071
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1072
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1073
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1074
check_compiler() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1075
	# Params:
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1076
	# $1 - Type for message (build / host)
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1077
	# $2 - What to fill with the found compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1078
	# $3 - System to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1079
	# $4 - Compiler to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1080
	# $5 - Env-setting to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1081
	# $6 - GCC alike to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1082
	# $7 - CC alike to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1083
	# $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1084
	# $9 - What the command is to check for
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1085
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1086
	if [ -n "$3" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1087
		# Check for system
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1088
		if [ -z "$6" ]; then
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1089
			compiler="$3"
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1090
		else
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1091
			compiler="$3-$6"
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1092
		fi
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1093
		machine=`eval $compiler $9 2>/dev/null`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1094
		ret=$?
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1095
		eval "$2=$compiler"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1096
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1097
		log 2 "executing $compiler $9"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1098
		log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1099
		log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1100
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1101
		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1102
			log 1 "checking $1... $compiler not found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1103
			log 1 "I couldn't detect any $6 binary for $3"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1104
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1105
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1106
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1107
		if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1108
			log 1 "checking $1... expected $3, found $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1109
			log 1 "the compiler suggests it doesn't build code for the machine you specified"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1110
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1111
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1112
	elif [ -n "$4" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1113
		# Check for manual compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1114
		machine=`$4 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1115
		ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1116
		eval "$2=$4"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1117
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1118
		log 2 "executing $4 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1119
		log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1120
		log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1121
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1122
		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1123
			log 1 "checking $1... $4 not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1124
			log 1 "the selected binary doesn't seem to be a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1125
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1126
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1127
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1128
		# Nothing given, autodetect
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1129
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1130
		if [ -n "$5" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1131
			machine=`$5 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1132
			ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1133
			eval "$2=$5"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1134
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1135
			log 2 "executing $5 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1136
			log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1137
			log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1138
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1139
			# The user defined a GCC that doesn't reply to $9.. abort
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1140
			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1141
				log 1 "checking $1... $5 unusable"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1142
				log 1 "the CC environment variable is set, but it doesn't seem to be a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1143
				log 1 "please redefine the CC/CXX environment to a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1144
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1145
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1146
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1147
			log 2 "checking $1... CC/CXX not set (skipping)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1148
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1149
			# No $5, so try '$6'
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1150
			machine=`$6 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1151
			ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1152
			eval "$2=$6"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1153
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1154
			log 2 "executing $6 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1155
			log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1156
			log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1157
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1158
			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1159
				# Maybe '$7'?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1160
				machine=`$7 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1161
				ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1162
				eval "$2=$7"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1163
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1164
				log 2 "executing $7 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1165
				log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1166
				log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1167
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1168
				# All failed, abort
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1169
				if [ -z "$machine" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1170
					log 1 "checking $1... $6 not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1171
					log 1 "I couldn't detect any $6 binary on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1172
					log 1 "please define the CC/CXX environment to where it is located"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1173
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1174
					exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1175
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1176
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1177
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1178
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1179
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1180
	if [ "$8" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1181
		eval "res=\$$2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1182
		log 1 "checking $1... $res"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1183
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1184
		log 1 "checking $1... $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1185
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1186
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1187
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1188
check_build() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1189
	check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1190
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1191
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1192
check_host() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1193
	# By default the host is the build
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1194
	if [ -z "$host" ]; then host="$build"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1195
	check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1196
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1197
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1198
check_cxx_build() {
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1199
	check_compiler "build c++" "cxx_build" "$build" "$cxx_build" "$CXX" "g++" "c++" 1 "-dumpmachine"
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1200
}
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1201
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1202
check_cxx_host() {
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1203
	# By default the host is the build
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1204
	if [ -z "$host" ]; then host="$build"; fi
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1205
	check_compiler "host c++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1206
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1207
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1208
check_windres() {
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1209
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1210
		check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1211
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1212
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1213
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1214
check_strip() {
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1215
	if [ "$os" = "OS2" ]; then
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1216
		# OS2 via gcc is a bit weird.. stripping HAS to be done via emxbind, which is via gcc directly
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1217
		echo "checking host strip... using gcc -s option"
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1218
	elif [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1219
		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1220
		echo "int main(int argc, char *argv[]) { }" > strip.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1221
		$cc_host strip.test.c -o strip.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1222
		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1223
		rm -f strip.test.c strip.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1224
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1225
		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "-V"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1226
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1227
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1228
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1229
check_lipo() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1230
	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1231
		echo "int main(int argc, char *argv[]) { }" > lipo.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1232
		$cc_host lipo.test.c -o lipo.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1233
		check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1234
		rm -f lipo.test.c lipo.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1235
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1236
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1237
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1238
check_direct_music() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1239
	echo "
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1240
		#include <windows.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1241
		#include <dmksctrl.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1242
		#include <dmusici.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1243
		#include <dmusicc.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1244
		#include <dmusicf.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1245
		int main(int argc, char *argv[]) { }" > direct_music.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1246
	$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1247
	res=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1248
	rm -f direct_music.test.c direct_music.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1249
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1250
	if [ "$res" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1251
		if [ "$with_direct_music" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1252
			log 1 "configure: error: direct-music is not available on this system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1253
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1254
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1255
		with_direct_music="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1256
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1257
		log 1 "checking direct-music... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1258
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1259
		log 1 "checking direct-music... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1260
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1261
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1262
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1263
check_makedepend() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1264
	if [ "$with_makedepend" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1265
		log 1 "checking makedepend... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1266
		return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1267
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1268
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1269
	if [ "$with_makedepend" = "1" ] || [ "$with_makedepend" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1270
		makedepend="makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1271
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1272
		makedepend="$with_makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1273
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1274
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1275
	rm -f makedepend.tmp
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1276
	touch makedepend.tmp
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1277
	res=`$makedepend -fmakedepend.tmp 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1278
	res=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1279
	log 2 "executing $makedepend -f makedepend.tmp"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1280
	log 2 "  returned `cat makedepend.tmp`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1281
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1282
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1283
	if [ ! -s makedepend.tmp ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1284
		rm -f makedepend.tmp makedepend.tmp.bak
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1285
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1286
		if [ "$with_makedepend" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1287
			log 1 "checking makedepend... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1288
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1289
			log 1 "I couldn't detect any makedepend on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1290
			log 1 "please locate it via --makedepend=[binary]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1291
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1292
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1293
		elif [ "$with_makedepend" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1294
			log 1 "checking makedepend... $makedepend not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1295
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1296
			log 1 "the selected file doesn't seem to be a valid makedepend binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1297
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1298
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1299
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1300
			log 1 "checking makedepend... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1301
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1302
			with_makedepend="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1303
			return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1304
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1305
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1306
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1307
	rm -f makedepend.tmp makedepend.tmp.bak
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1308
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1309
	log 1 "checking makedepend... $makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1310
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1311
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1312
detect_awk() {
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1313
	# Not all awks allow gsub(), so we test for that here! It is in fact all we need...
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1314
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1315
	# These awks are known to work. Test for them explicit
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1316
	awks="gawk mawk nawk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1317
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1318
	awk_prefix="echo \"a.c b.c c.c\" | tr ' ' \\\\n | "
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1319
	awk_param="' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", \$0); print \$0; }' 2>/dev/null"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1320
	awk_result="a.o b.o c.o "
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1321
	log 2 "Detecing awk..."
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1322
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1323
	log 2 "Trying: $awk_prefix $awk $awk_param"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1324
	res=`eval $awk_prefix $awk $awk_param`
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1325
	log 2 "Result: '$res'"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1326
	if [ "$res" != "$awk_result" ] && [ "$awk" = "awk" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1327
		# User didn't supply his own awk, so try to detect some other known working names for an awk
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1328
		for awk in $awks; do
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1329
			log 2 "Trying: $awk_prefix $awk $awk_param"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1330
			res=`eval $awk_prefix $awk $awk_param`
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1331
			log 2 "Result: '$res'"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1332
			if [ "$res" = "$awk_result" ]; then break; fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1333
		done
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1334
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1335
		if [ "$res" != "$awk_result" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1336
			log 1 "checking awk... not found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1337
			log 1 "configure: error: no awk found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1338
			log 1 "configure: error: please install one of the following: $awks"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1339
			exit 1
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1340
		fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1341
	fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1342
	if [ "$res" != "$awk_result" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1343
		log 1 "checking awk... not found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1344
		log 1 "configure: error: you supplied '$awk' but it doesn't seem a valid gawk or mawk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1345
		exit 1
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1346
	fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1347
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1348
	log 1 "checking awk... $awk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1349
}
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1350
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1351
detect_os() {
6077
ec7199271f52 (svn r8810) [Configure] -Fix: "" variables if you test them, else if they are empty they return lovely errors (tnx to Celester for finding thisone ;))
truelight
parents: 6046
diff changeset
  1352
	if [ "$os" = "DETECT" ]; then
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1353
		# Detect UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1354
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1355
		# Try first via dumpmachine, then via uname
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1356
		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1357
					/linux/        { print "UNIX";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1358
					/darwin/       { print "OSX";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1359
					/freebsd/      { print "FREEBSD"; exit}
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1360
					/openbsd/      { print "OPENBSD"; exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1361
					/morphos/      { print "MORPHOS"; exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1362
					/beos/         { print "BEOS";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1363
					/sunos/        { print "SUNOS";   exit}
6220
7694e640e7a2 (svn r9017) [Config] -Fix: if 'solaris' is in gcc dumpmachine, we have SunOS
truelight
parents: 6191
diff changeset
  1364
					/solaris/      { print "SUNOS";   exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1365
					/cygwin/       { print "CYGWIN";  exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1366
					/mingw/        { print "MINGW";   exit}
5539
a77ac9a34e98 (svn r7881) [Configure] -Fix: OS2 GCC indentifies itself with os2, not os/2
truelight
parents: 5538
diff changeset
  1367
					/os2/          { print "OS2";     exit}
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1368
					/wince/        { print "WINCE";   exit}
5957
89ca54f5da71 (svn r8628) [PSP] -Add: added configure support for the PlayStation Portable target
truelight
parents: 5941
diff changeset
  1369
					/psp/          { print "PSP";     exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1370
		'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1371
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1372
		if [ -z "$os" ]; then
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1373
			os=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | $awk '
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1374
					/linux/        { print "UNIX";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1375
					/darwin/       { print "OSX";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1376
					/freebsd/      { print "FREEBSD"; exit}
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1377
					/openbsd/      { print "OPENBSD"; exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1378
					/morphos/      { print "MORPHOS"; exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1379
					/beos/         { print "BEOS";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1380
					/sunos/        { print "SUNOS";   exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1381
					/cygwin/       { print "CYGWIN";  exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1382
					/mingw/        { print "MINGW";   exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1383
					/os\/2/        { print "OS2";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1384
			'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1385
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1386
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1387
		if [ -z "$os" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1388
			log 1 "detecting OS... none detected"
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1389
			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1390
			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1391
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1392
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1393
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1394
		log 1 "detecting OS... $os"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1395
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1396
		log 1 "forcing OS... $os"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1397
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1398
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1399
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1400
detect_sdl() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1401
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1402
	if [ "$with_sdl" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1403
		log 1 "checking SDL... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1404
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1405
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1406
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1407
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1408
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1409
	if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1410
		log 1 "configure: error: it is impossible to compile both SDL and COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1411
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1412
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1413
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1414
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1415
	if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1416
		log 1 "configure: error: it is impossible to compile a dedicated with SDL"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1417
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1418
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1419
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1420
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1421
	if [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1422
		log 1 "checking SDL... skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1423
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1424
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1425
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1426
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1427
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1428
	# By default on OSX we don't use SDL. The rest is auto-detect
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1429
	if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1430
		log 1 "checking SDL... OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1431
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1432
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1433
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1434
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1435
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1436
	if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then
5537
e1b80c739061 (svn r7878) Remove the long gone sdl11-config (again)
tron
parents: 5536
diff changeset
  1437
		sdl_config="sdl-config"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1438
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1439
		sdl_config="$with_sdl"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1440
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1441
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1442
	version=`$sdl_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1443
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1444
	log 2 "executing $sdl_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1445
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1446
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1447
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1448
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1449
		log 1 "checking SDL... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1450
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1451
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1452
		if [ "$with_sdl" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1453
			log 1 "configure: error: sdl-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1454
			log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1455
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1456
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1457
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1458
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1459
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1460
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1461
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1462
	log 1 "checking SDL... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1463
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1464
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1465
detect_cocoa() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1466
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1467
	if [ "$with_cocoa" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1468
		log 1 "checking COCOA... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1469
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1470
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1471
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1472
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1473
	if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1474
		log 1 "configure: error: it is impossible to compile a dedicated with COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1475
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1476
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1477
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1478
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1479
	if [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1480
		log 1 "checking COCOA... skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1481
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1482
		with_cocoa="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1483
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1484
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1485
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1486
	# By default on OSX we use COCOA. The rest doesn't support it
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1487
	if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1488
		log 1 "checking COCOA... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1489
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1490
		with_cocoa="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1491
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1492
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1493
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1494
	if [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1495
		log 1 "checking COCOA... not OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1496
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1497
		log 1 "configure: error: COCOA video driver is only supported for OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1498
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1499
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1500
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1501
	log 1 "checking COCOA... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1502
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1503
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1504
detect_library() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1505
	# $1 - config-param ($with_zlib value)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1506
	# $2 - library name ('zlib', sets $zlib)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1507
	# $3 - static library name (libz.a)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1508
	# $4 - header name (zlib.h)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1509
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1510
	# 0 means no, 1 is auto-detect, 2 is force
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1511
	if [ "$1" = "0" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1512
		log 1 "checking $2... disabled"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1513
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1514
		eval "$2=\"\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1515
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1516
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1517
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1518
	log 2 "detecting $2"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1519
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1520
	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1521
		eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | grep \"\/$4\$\"`"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1522
		eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1523
		if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1524
			log 2 "  trying /usr/include/$4... no"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1525
			eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | grep \"\/$4\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1526
		fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1527
		eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1528
		if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1529
			log 2 "  trying /usr/local/include/$4... no"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1530
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1531
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1532
		eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1533
		if [ -n "$res" ] && [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1534
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1535
			log 2 "  trying $res... found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1536
			# Now find the static lib, if needed
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1537
			eval "$2=`ls /lib/*.a 2>/dev/null | grep \"\/$3\$\"`"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1538
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1539
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1540
				log 2 "  trying /lib/$3... no"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1541
				eval "$2=`ls /usr/lib/*.a 2>/dev/null | grep \"\/$3\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1542
			fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1543
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1544
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1545
				log 2 "  trying /usr/lib/$3... no"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1546
				eval "$2=`ls /usr/local/lib/*.a 2>/dev/null | grep \"\/$3\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1547
			fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1548
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1549
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1550
				log 2 "  trying /usr/local/lib/$3... no"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1551
				log 1 "configure: error: $2 couldn't be found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1552
				log 1 "configure: error: you requested a static link, but I can't find $3"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1553
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1554
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1555
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1556
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1557
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1558
		# Make sure it exists
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1559
		if [ -f "$1" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1560
			eval "$2=`ls $1 2>/dev/null`"
5505
fa01ea67ac75 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents: 5503
diff changeset
  1561
		else
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1562
			eval "$2=`ls $1/$3 2>/dev/null`"
5505
fa01ea67ac75 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents: 5503
diff changeset
  1563
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1564
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1565
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1566
	eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1567
	if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1568
		log 1 "checking $2... not found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1569
		if [ "$1" = "2" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1570
			log 1 "configure: error: $2 couldn't be found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1571
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1572
			exit 1
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1573
		elif [ "$1" != "1" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1574
			log 1 "configure: error: $2 couldn't be found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1575
			log 1 "configure: error: you supplied '$1', but it seems invalid"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1576
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1577
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1578
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1579
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1580
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1581
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1582
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1583
	eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1584
	log 2 "  trying $res... found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1585
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1586
	log 1 "checking $2... found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1587
}
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1588
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1589
detect_zlib() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1590
	detect_library "$with_zlib" "zlib" "libz.a" "zlib.h"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1591
}
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1592
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1593
detect_libtimidity() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1594
	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1595
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1596
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1597
detect_png() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1598
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1599
	if [ "$with_png" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1600
		log 1 "checking libpng... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1601
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1602
		png_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1603
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1604
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1605
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1606
	if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1607
		log 1 "configure: error: libpng depends on zlib, which couldn't be found / was disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1608
		log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1609
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1610
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1611
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1612
	if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1613
		png_config="libpng-config"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1614
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1615
		png_config="$with_png"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1616
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1617
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1618
	version=`$png_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1619
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1620
	log 2 "executing $png_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1621
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1622
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1623
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1624
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1625
		log 1 "checking libpng... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1626
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1627
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1628
		if [ "$with_png" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1629
			log 1 "configure: error: libpng-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1630
			log 1 "configure: error: you supplied '$with_png', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1631
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1632
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1633
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1634
		png_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1635
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1636
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1637
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1638
	log 1 "checking libpng... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1639
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1640
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1641
detect_freetype() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1642
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1643
	if [ "$with_freetype" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1644
		log 1 "checking libfreetype... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1645
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1646
		freetype_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1647
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1648
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1649
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1650
	if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1651
		log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1652
		log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1653
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1654
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1655
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1656
	if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1657
		freetype_config="freetype-config"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1658
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1659
		freetype_config="$with_freetype"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1660
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1661
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1662
	version=`$freetype_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1663
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1664
	log 2 "executing freetype_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1665
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1666
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1667
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1668
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1669
		log 1 "checking libfreetype... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1670
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1671
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1672
		if [ "$with_freetype" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1673
			log 1 "configure: error: freetype-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1674
			log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1675
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1676
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1677
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1678
		freetype_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1679
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1680
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1681
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1682
	log 1 "checking libfreetype... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1683
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1684
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1685
detect_fontconfig() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1686
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1687
	if [ "$with_fontconfig" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1688
		log 1 "checking libfontconfig... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1689
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1690
		fontconfig_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1691
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1692
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1693
6249
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1694
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1695
		log 1 "checking libfontconfig... WIN32, skipping"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1696
		fontconfig_config=""
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1697
		return 0
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1698
	fi
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1699
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1700
	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1701
		fontconfig_config="pkg-config fontconfig"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1702
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1703
		fontconfig_config="$with_fontconfig"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1704
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1705
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1706
	version=`$fontconfig_config --modversion 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1707
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1708
	shortversion=`echo $version | cut -c 1,3`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1709
	log 2 "executing $fontconfig_config --modversion"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1710
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1711
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1712
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1713
	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1714
		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1715
			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1716
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1717
			log 1 "checking libfontconfig... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1718
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1719
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1720
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1721
		if [ "$with_fontconfig" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1722
			log 1 "configure: error: fontconfig-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1723
			log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1724
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1725
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1726
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1727
		fontconfig_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1728
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1729
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1730
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1731
	log 1 "checking libfontconfig... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1732
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1733
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1734
detect_pspconfig() {
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1735
	# 0 means no, 1 is auto-detect, 2 is force
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1736
	if [ "$with_psp_config" = "0" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1737
		log 1 "checking psp-config... disabled"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1738
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1739
		psp_config=""
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1740
		return 0
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1741
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1742
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1743
	if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1744
		log 1 "checking psp-config... not PSP, skipping"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1745
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1746
		psp_config="";
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1747
		return 0
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1748
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1749
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1750
	if [ "$os" != "PSP" ]; then
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1751
		log 1 "checking psp-config... not PSP"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1752
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1753
		log 1 "configure: error: psp-config is only supported for PSP"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1754
		exit 1
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1755
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1756
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1757
	if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1758
		psp_config="psp-config"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1759
	else
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1760
		psp_config="$with_psp_config"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1761
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1762
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1763
	version=`$psp_config -p 2>/dev/null`
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1764
	ret=$?
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1765
	log 2 "executing $psp_config -p"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1766
	log 2 "  returned $version"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1767
	log 2 "  exit code $ret"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1768
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1769
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1770
		log 1 "checking psp-config... not found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1771
		log 1 "configure: error: psp-config couldn't be found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1772
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1773
		# It was forced, so it should be found.
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1774
		if [ "$with_psp_config" != "1" ]; then
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  1775
			log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1776
		fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1777
		exit 1
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1778
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1779
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1780
	log 1 "checking psp-config... found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1781
}
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  1782
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1783
detect_iconv() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1784
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1785
	if [ "$with_iconv" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1786
		log 1 "checking iconv... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1787
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1788
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1789
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1790
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1791
	if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1792
		log 1 "checking iconv... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1793
		with_iconv="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1794
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1795
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1796
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1797
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1798
	# Try to find iconv.h, seems to only thing to detect iconv with
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1799
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1800
	if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1801
		iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"`
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1802
		if [ -z "$iconv" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1803
			iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1804
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1805
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1806
		# Make sure it exists
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1807
		iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1808
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1809
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1810
	if [ -z "$iconv" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1811
		log 1 "checking iconv... not found"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1812
		if [ "$with_iconv" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1813
			log 1 "configure: error: iconv couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1814
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1815
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1816
		elif [ "$with_iconv" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1817
			log 1 "configure: error: iconv couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1818
			log 1 "configure: error: you supplied '$with_iconv', but I couldn't detect iconv in it"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1819
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1820
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1821
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1822
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1823
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1824
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1825
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1826
	if [ "$with_iconv" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1827
		with_iconv="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1828
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1829
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1830
	log 2 "found iconv in $iconv"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1831
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1832
	log 1 "checking iconv... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1833
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1834
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1835
_detect_sort() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1836
	sort_test_in="d
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1837
a
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1838
c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1839
b"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1840
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1841
	sort_test_out="a
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1842
b
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1843
c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1844
d"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1845
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1846
	log 2 "running echo <array> | $1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1847
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1848
	if [ "`echo \"$sort_test_in\" | $1 2>/dev/null`" = "$sort_test_out" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1849
		sort="$1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1850
		log 2 "  result was valid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1851
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1852
		log 2 "  result was invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1853
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1854
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1855
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1856
detect_sort() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1857
	if [ "$with_sort" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1858
		log 1 "checking sort... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1859
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1860
		return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1861
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1862
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1863
	if [ "$with_sort" = "1" ] || [ "$with_sort" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1864
		_detect_sort "sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1865
		if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1866
		if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1867
		if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1868
		if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1869
		if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1870
		if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1871
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1872
		_detect_sort "$with_sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1873
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1874
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1875
	if [ -z "$sort" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1876
		if [ "$with_sort" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1877
			log 1 "checking sort... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1878
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1879
			log 1 "configure: error: couldn't detect sort on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1880
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1881
		elif [ "$with_sort" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1882
			log 1 "checking sort... $with_sort not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1883
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1884
			log 1 "configure: error: '$with_sort' doesn't look like a sort to me"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1885
			log 1 "configure: error: please verify its location and function and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1886
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1887
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1888
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1889
			log 1 "checking sort... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1890
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1891
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1892
		log 1 "checking sort... $sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1893
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1894
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1895
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1896
make_sed() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1897
	# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1898
	#  We do this here, and not sooner, so universal builds also have this
5541
f034f6f60d88 (svn r7883) It's spelled 'automatically'
tron
parents: 5539
diff changeset
  1899
	#  automatically correct
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1900
	# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1901
	#  we use 1 byte per bool normally in C part. So convert that last one to 4
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1902
	#  bytes too, but only for PPC.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1903
	ppc=`$cc_host -dumpmachine | grep "powerpc\|ppc"`
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1904
	if [ -n "$ppc" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1905
		T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1906
		osx_sysroot_version=10.3.9
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1907
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1908
		T_CFLAGS="$CFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1909
		osx_sysroot_version=10.4u
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1910
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1911
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1912
	T_LDFLAGS="$LDFLAGS"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1913
	if [ "$with_osx_sysroot" = "3" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1914
		T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1915
		T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1916
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1917
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1918
	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1919
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1920
	# All the data needed to compile a single target
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1921
	#  Make sure if you compile multiple targets to
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1922
	#  use multiple OBJS_DIR, because all in-between
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1923
	#  binaries are stored in there, and nowhere else.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1924
	SRC_REPLACE="
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1925
		s#!!CC_HOST!!#$cc_host#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1926
		s#!!CXX_HOST!!#$cxx_host#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1927
		s#!!CC_BUILD!!#$cc_build#g;
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1928
		s#!!CXX_BUILD!!#$cxx_build#g;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1929
		s#!!WINDRES!!#$windres#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1930
		s#!!STRIP!!#$strip $strip_arg#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1931
		s#!!LIPO!!#$lipo#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1932
		s#!!CC_CFLAGS!!#$CC_CFLAGS#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1933
		s#!!CFLAGS!!#$T_CFLAGS#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1934
		s#!!CFLAGS_BUILD!!#$CFLAGS_BUILD#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1935
		s#!!STRGEN_FLAGS!!#$strgen_flags#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1936
		s#!!LIBS!!#$LIBS#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1937
		s#!!LDFLAGS!!#$T_LDFLAGS#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1938
		s#!!BIN_DIR!!#$BIN_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1939
		s#!!ROOT_DIR!!#$ROOT_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1940
		s#!!MEDIA_DIR!!#$MEDIA_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1941
		s#!!SOURCE_LIST!!#$SOURCE_LIST#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1942
		s#!!SRC_OBJS_DIR!!#$SRC_OBJS_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1943
		s#!!LANG_OBJS_DIR!!#$LANG_OBJS_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1944
		s#!!SRC_DIR!!#$SRC_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1945
		s#!!OSXAPP!!#$OSXAPP#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1946
		s#!!LANG_DIR!!#$LANG_DIR#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1947
		s#!!TTD!!#$TTD#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1948
		s#!!BINARY_DIR!!#$prefix_dir/$binary_dir#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1949
		s#!!DATA_DIR!!#$prefix_dir/$data_dir#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1950
		s#!!ICON_DIR!!#$prefix_dir/$icon_dir#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1951
		s#!!PERSONAL_DIR!!#$personal_dir#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1952
		s#!!INSTALL_DIR!!#$install_dir#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1953
		s#!!STRGEN!!#$STRGEN#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1954
		s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1955
		s#!!ENDIAN_FORCE!!#$endian#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1956
		s#!!STAGE!!#$STAGE#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1957
		s#!!MAKEDEPEND!!#$makedepend#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1958
		s#!!CFLAGS_MAKEDEP!!#$cflags_makedep#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1959
		s#!!SORT!!#$sort#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1960
		s#!!CONFIG_CACHE_COMPILER!!#config.cache.compiler#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1961
		s#!!CONFIG_CACHE_LINKER!!#config.cache.linker#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1962
		s#!!CONFIG_CACHE_ENDIAN!!#config.cache.endian#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1963
		s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1964
		s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1965
		s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1966
		s#!!LANG_SUPPRESS!!#$lang_suppress#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1967
		s#!!OBJS_C!!#$OBJS_C#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1968
		s#!!OBJS_CPP!!#$OBJS_CPP#g;
5941
adaea39e84ab (svn r8605) -Codechange: [OSX] changed all objective C to objective C++
bjarni
parents: 5923
diff changeset
  1969
		s#!!OBJS_MM!!#$OBJS_MM#g;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1970
		s#!!OBJS_RC!!#$OBJS_RC#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1971
		s#!!SRCS!!#$SRCS#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1972
		s#!!OS!!#$os#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1973
		s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1974
		s#!!REVISION!!#$revision#g;
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1975
		s#!!AWK!!#$awk#g;
6523
bbc566ffb999 (svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents: 6512
diff changeset
  1976
		s#!!GCC295!!#$gcc295#g;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1977
		s#!!ENABLE_INSTALL!!#$enable_install#g;
6851
0a0a094fb9f1 (svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
rubidium
parents: 6850
diff changeset
  1978
		s#!!DISTCC!!#$distcc#g;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1979
	"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1980
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1981
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1982
generate_main() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1983
	STAGE="[MAIN]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1984
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1985
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1986
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1987
	# Create the main Makefile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1988
	echo "Generating Makefile..."
5555
f1c050be9cf8 (svn r7939) Fix useless use of cat
tron
parents: 5551
diff changeset
  1989
	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1990
	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
5556
2c1fdf0bc6a4 (svn r7940) Add an empty line instead of overwriting the just written file
tron
parents: 5555
diff changeset
  1991
	echo >> Makefile.am
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1992
	# Make the copy of the source-list, so we don't trigger an unwanted recompile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1993
	cp $SOURCE_LIST config.cache.source.list
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1994
	# Make sure config.cache is OLDER then config.cache.source.list
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1995
	touch config.cache
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1996
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1997
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1998
generate_lang() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1999
	STAGE="[LANG]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2000
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2001
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2002
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2003
	# Create the language file
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2004
	mkdir -p $LANG_OBJS_DIR
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2005
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2006
	echo "Generating lang/Makefile..."
5555
f1c050be9cf8 (svn r7939) Fix useless use of cat
tron
parents: 5551
diff changeset
  2007
	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2008
	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2009
	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2010
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2011
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2012
generate_src_normal() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2013
	STAGE=$1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2014
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2015
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2016
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2017
	# Create the source file
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2018
	mkdir -p $SRC_OBJS_DIR
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2019
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2020
	echo "Generating $2/Makefile..."
5555
f1c050be9cf8 (svn r7939) Fix useless use of cat
tron
parents: 5551
diff changeset
  2021
	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2022
	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2023
	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2024
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2025
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2026
generate_src_osx() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2027
	cc_host_orig="$cc_host"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2028
	cxx_host_orig="$cxx_host"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2029
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2030
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2031
	cc_host="$cc_host_orig -arch ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2032
	cxx_host="$cxx_host_orig -arch ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2033
	generate_src_normal "[PowerPC]" "objs/ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2034
5493
3796771bb24b (svn r7777) [Configure] -Fix: call intel builds on OSX universal compiles intel, not i386 (that is just silly)
truelight
parents: 5491
diff changeset
  2035
	BASE_SRC_OBJS_DIR="$OBJS_DIR/intel"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2036
	cc_host="$cc_host_orig -arch i386"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2037
	cxx_host="$cxx_host_orig -arch i386"
5494
2b201653bf19 (svn r7778) -Fix (r7777): intel -> Intel
truelight
parents: 5493
diff changeset
  2038
	generate_src_normal "[Intel]" "objs/intel"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2039
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2040
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2041
	cc_host="$cc_host_orig -arch ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2042
	cxx_host="$cxx_host_orig -arch ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2043
	CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2044
	generate_src_normal "[PowerPC G5]" "objs/ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2045
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2046
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2047
generate_src() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2048
	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2049
		generate_src_osx
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2050
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2051
		generate_src_normal "[SRC]" "objs"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2052
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2053
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2054
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2055
showhelp() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2056
	echo "'configure' configures OpenTTD."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2057
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2058
	echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2059
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2060
	echo "To assign environment variables (e.g., CC, CFLAGS...), specify them as"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2061
	echo "VAR=VALUE.  See below for descriptions of some of the useful variables."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2062
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2063
	echo "Defaults for the options are specified in brackets."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2064
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2065
	echo "Configuration:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2066
	echo "  -h, --help                     display this help and exit"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2067
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2068
	echo "System types:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2069
	echo "  --build=BUILD                  configure for building on BUILD [guessed]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2070
	echo "  --host=HOST                    cross-compile to build programs to run"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2071
	echo "                                 on HOST [BUILD]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2072
	echo "  --windres=WINDRES              the windres to use [HOST-windres]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2073
	echo "  --strip=STRIP                  the strip to use [HOST-strip]"
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  2074
	echo "  --awk=AWK                      the awk to use in configure [awk]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2075
	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2076
	echo "  --os=OS                        the OS we are compiling for [DETECT]"
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  2077
	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/MORPHOS/"
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  2078
	echo "                                 BEOS/SUNOS/CYGWIN/MINGW/OS2/WINCE/PSP"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2079
	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2080
	echo "  --revision=rXXXX               overwrite the revision detection."
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2081
	echo "                                 Use with care!"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2082
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2083
	echo "Paths:"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2084
	echo "  --prefix-dir=dir               specifies the prefix for all installed"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2085
	echo "                                 files [/usr/local]"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2086
	echo "  --binary-dir=dir               location of the binary. Will be prefixed"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2087
	echo "                                 with the prefix-dir [games]"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2088
	echo "  --data-dir=dir                 location of data files (lang, data, gm)."
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2089
	echo "                                 Will be prefixed with the prefix-dir"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2090
	echo "                                 [share/games/openttd]"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2091
	echo "  --icon-dir=dir                 location of icons. Will be prefixed"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2092
	echo "                                 with the prefix-dir [share/pixmaps]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2093
	echo "  --personal-dir=dir             location of the personal directory []"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2094
	echo "  --install-dir=dir              specifies the root to install to."
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2095
	echo "                                 Useful to install into jails [/]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2096
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2097
# TODO: The Following 3 tags will be removed when the 'search path patch' is applied
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2098
	echo "  --second-data-dir=dir          specifies a second directory for the"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2099
	echo "                                 data files"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2100
	echo "  --custom-lang-dir=dir          specifies a custom directory for the"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2101
	echo "                                 language files"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2102
	echo "  --enable-install               make a binary that uses the specified"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2103
	echo "                                 data-dir and icon-dir"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2104
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2105
	echo "Features and packages:"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2106
	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2107
	echo "  --enable-profiling             enables profiling"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2108
	echo "  --enable-dedicated             compile a dedicated server (without video)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2109
	echo "  --enable-static                enable static compile (doesn't work for"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2110
	echo "                                 all HOSTs)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2111
	echo "  --enable-translator            enable extra output for translators"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2112
	echo "  --enable-universal             enable universal builds (OSX ONLY)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2113
	echo "  --enable-osx-g5                enables optimalizations for G5 (OSX ONLY)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2114
	echo "  --disable-network              disable network support"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2115
	echo "  --disable-assert               disable asserts (continue on errors)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2116
	echo "  --disable-strip                disable any possible stripping"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2117
	echo "  --without-osx-sysroot          disable the automatic adding of sysroot "
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2118
	echo "                                 (OSX ONLY)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2119
	echo "  --without-application-bundle   disable generation of application bundle"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2120
	echo "                                 (OSX ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2121
	echo "  --with-direct-music            enable direct music support (Win32 ONLY)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2122
	echo "  --with-sort=sort               define a non-default location for sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2123
	echo "  --with-midi=midi               define which midi-player to use"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2124
	echo "  --with-midi-arg=arg            define which args to use for the"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2125
	echo "                                 midi-player"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2126
	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2127
	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2128
	echo "  --with-zlib[=zlib.a]           enables zlib support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2129
	echo "  --with-png[=libpng-config]     enables libpng support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2130
	echo "  --with-freetype[=freetype-config]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2131
	echo "                                 enables libfreetype support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2132
	echo "  --with-fontconfig[=pkg-config fontconfig]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2133
	echo "                                 enables fontconfig support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2134
	echo "  --with-iconv[=iconv-path]      enables iconv support"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2135
	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2136
	echo "  --with-makedepend[=makedepend] enables makedepend support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2137
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2138
	echo "Some influential environment variables:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2139
	echo "  CC                             C compiler command"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2140
	echo "  CXX                            C++ compiler command"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2141
	echo "  CFLAGS                         C compiler flags"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2142
	echo "  WINDRES                        windres command"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2143
	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2144
	echo "                                 have libraries in a nonstandard"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2145
	echo "                                 directory <lib dir>"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2146
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2147
	echo "Use these variables to override the choices made by 'configure' or to help"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2148
	echo "it to find libraries and programs with nonstandard names/locations."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2149
}