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