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