config.lib
author truebrain
Sun, 19 Oct 2008 21:32:29 +0000
changeset 10266 21572e285f06
parent 10265 625e98387a07
child 10277 d081d791dcee
permissions -rw-r--r--
(svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     2
log() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     3
	if [ $1 = "1" ]; then echo "$2"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     4
	echo "$2" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     5
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     6
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
     7
set_default() {
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
     8
	released_version=""
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
     9
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    10
	ignore_extra_parameters="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    11
	# We set all kinds of defaults for params. Later on the user can override
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    12
	# most of them; but if they don't, this default is used.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    13
	build=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    14
	host=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    15
	cc_build=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    16
	cc_host=""
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
    17
	cxx_build=""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    18
	cxx_host=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    19
	windres=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    20
	strip=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    21
	lipo=""
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
    22
	awk="awk"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    23
	os="DETECT"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    24
	endian="AUTO"
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
    25
	cpu_type="DETECT"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    26
	revision=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    27
	config_log="config.log"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    28
	prefix_dir="/usr/local"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    29
	binary_dir="games"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    30
	data_dir="share/games/openttd"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    31
	doc_dir="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    32
	icon_dir="share/pixmaps"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    33
	icon_theme_dir="1"
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
    34
	personal_dir="1"
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
    35
	shared_dir="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    36
	install_dir="/"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    37
	man_dir="1"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    38
	menu_dir="1"
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
    39
	menu_group="Game;"
10245
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
    40
	menu_name="OpenTTD"
10244
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
    41
	binary_name="openttd"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    42
	enable_debug="0"
8080
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
    43
	enable_desync_debug="0"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    44
	enable_profiling="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    45
	enable_dedicated="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    46
	enable_network="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    47
	enable_static="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    48
	enable_translator="0"
8244
9fdec5112828 (svn r11808) -Fix: remember --with-ccache in config.cache
smatz
parents: 8161
diff changeset
    49
	enable_unicode="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    50
	enable_assert="1"
8782
966391d8d879 (svn r12483) -Change: disable stripping of binaries by default so we have a (much) better chance of actually getting something useful out of OSX stacktraces.
rubidium
parents: 8695
diff changeset
    51
	enable_strip="0"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    52
	enable_universal="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    53
	enable_osx_g5="0"
8092
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
    54
	enable_cocoa_quartz="1"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
    55
	enable_cocoa_quickdraw="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    56
	with_osx_sysroot="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    57
	with_application_bundle="1"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    58
	with_menu_entry="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    59
	with_sdl="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    60
	with_cocoa="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    61
	with_zlib="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    62
	with_png="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    63
	with_makedepend="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    64
	with_direct_music="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    65
	with_sort="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    66
	with_iconv="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    67
	with_midi=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    68
	with_midi_arg=""
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
    69
	with_libtimidity="1"
5578
5f898d0bfebd (svn r8019) -Fix (r7759): if libfreetype was not found (and not forced to be used), the configure script aborted instead of marking it a 'not found'.
rubidium
parents: 5560
diff changeset
    70
	with_freetype="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    71
	with_fontconfig="1"
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
    72
	with_icu="1"
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
    73
	with_psp_config="1"
7294
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
    74
	with_threads="1"
8244
9fdec5112828 (svn r11808) -Fix: remember --with-ccache in config.cache
smatz
parents: 8161
diff changeset
    75
	with_distcc="1"
9fdec5112828 (svn r11808) -Fix: remember --with-ccache in config.cache
smatz
parents: 8161
diff changeset
    76
	with_ccache="1"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
    77
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    78
	save_params_array="
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    79
		build
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    80
		host
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    81
		cc_build
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    82
		cc_host
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    83
		cxx_build
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    84
		cxx_host
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    85
		windres
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    86
		strip
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    87
		lipo
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    88
		awk
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    89
		os
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    90
		endian
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    91
		cpu_type
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    92
		revision
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    93
		config_log
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    94
		prefix_dir
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    95
		binary_dir
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    96
		data_dir
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    97
		doc_dir
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
    98
		icon_dir
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
    99
		icon_theme_dir
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   100
		man_dir
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   101
		menu_dir
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   102
		personal_dir
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   103
		shared_dir
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   104
		install_dir
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   105
		menu_group
10245
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
   106
		menu_name
10244
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
   107
		binary_name
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   108
		enable_debug
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   109
		enable_desync_debug
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   110
		enable_profiling
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   111
		enable_dedicated
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   112
		enable_network
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   113
		enable_static
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   114
		enable_translator
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   115
		enable_unicode
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   116
		enable_assert
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   117
		enable_strip
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   118
		enable_universal
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   119
		enable_osx_g5
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   120
		enable_cocoa_quartz
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   121
		enable_cocoa_quickdraw
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   122
		with_osx_sysroot
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   123
		with_application_bundle
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   124
		with_sdl
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   125
		with_cocoa
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   126
		with_zlib
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   127
		with_png
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   128
		with_makedepend
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   129
		with_direct_music
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   130
		with_sort
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   131
		with_iconv
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   132
		with_midi
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   133
		with_midi_arg
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   134
		with_libtimidity
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   135
		with_freetype
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   136
		with_fontconfig
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   137
		with_icu
8269
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   138
		with_psp_config
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   139
		with_threads
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   140
		with_distcc
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   141
		with_ccache
6dc204e1c957 (svn r11833) -Cleanup: changed save_params_array into one item for each line in config.lib
bjarni
parents: 8247
diff changeset
   142
	CC CXX CFLAGS LDFLAGS"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   143
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   144
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   145
detect_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   146
	# Walk over all params from the user and override any default settings if
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   147
	#  needed. This also handles any invalid option.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   148
	for p in "$@"; do
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   149
		if [ -n "$prev_p" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   150
			eval "$prev_p=\$p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   151
			prev_p=
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   152
			continue
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   153
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   154
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   155
		optarg=`expr "x$p" : 'x[^=]*=\(.*\)'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   156
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   157
		case "$p" in
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
   158
			--help | -h)                  showhelp; exit 0;;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   159
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   160
			--config-log)                 prev_p="config_log";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   161
			--config-log=*)               config_log="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   162
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   163
			--build)                      prev_p="build";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   164
			--build=*)                    build="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   165
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   166
			--host)                       prev_p="host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   167
			--host=*)                     host="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   168
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   169
			--os)                         prev_p="os";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   170
			--os=*)                       os="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   171
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   172
			--cpu-type)                   prev_p="cpu_type";;
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   173
			--cpu-type=*)                 cpu_type="$optarg";;
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   174
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   175
			--revision=*)                 revision="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   176
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   177
			--cc-build)                   prevp_p="cc_build";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   178
			--cc-build=*)                 cc_build="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   179
			--cc-host)                    prevp_p="cc_host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   180
			--cc-host=*)                  cc_host="$optarg";;
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   181
			--cxx-build)                  prevp_p="cxx_build";;
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   182
			--cxx-build=*)                cxx_build="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   183
			--cxx-host)                   prevp_p="cxx_host";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   184
			--cxx-host=*)                 cxx_host="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   185
			--windres)                    prevp_p="windres";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   186
			--windres=*)                  windres="$optarg";;
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   187
			--awk)                        prevp_p="awk";;
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   188
			--awk=*)                      awk="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   189
			--strip)                      prevp_p="strip";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   190
			--strip=*)                    strip="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   191
			--lipo)                       prevp_p="lipo";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   192
			--lipo=*)                     lipo="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   193
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   194
			--endian)                     prev_p="endian";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   195
			--endian=*)                   endian="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   196
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   197
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   198
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   199
			--prefix-dir)                 prevp_p="prefix-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   200
			--prefix-dir=*)               prefix_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   201
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   202
			--binary-dir)                 prevp_p="binary-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   203
			--binary-dir=*)               binary_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   204
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   205
			--data-dir)                   prevp_p="data-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   206
			--data-dir=*)                 data_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   207
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   208
			--doc-dir)                    prevp_p="doc-dir";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   209
			--doc-dir=*)                  doc_dir="$optarg";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   210
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   211
			--icon-dir)                   prevp_p="icon-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   212
			--icon-dir=*)                 icon_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   213
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   214
			--icon-theme-dir)             prevp_p="icon-theme-dir";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   215
			--icon-theme-dir=*)           icon_theme_dir="$optarg";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   216
			--without-icon-theme)         icon_theme_dir="";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   217
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   218
			--menu-dir)                   prevp_p="menu_dir";;
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   219
			--menu-dir=*)                 menu_dir="$optarg";;
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   220
			--without-menu-entry)         menu_dir="";;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   221
10245
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
   222
			--menu-name)                  prevp_p="menu_name";;
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
   223
			--menu-name=*)                menu_name="$optarg";;
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
   224
10244
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
   225
			--binary-name)                prevp_p="binary_name";;
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
   226
			--binary-name=*)              binary_name="$optarg";;
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
   227
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   228
			--man-dir)                    prevp_p="man_dir";;
9707
55728bd4d33e (svn r13819) -Fix (r13801): --man-dir=xxx was 'ignored'
glx
parents: 9697
diff changeset
   229
			--man-dir=*)                  man_dir="$optarg";;
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   230
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   231
			--personal-dir)               prevp_p="personal-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   232
			--personal-dir=*)             personal_dir="$optarg";;
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   233
			--without-personal-dir)       personal_dir="";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   234
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   235
			--shared-dir)                 prevp_p="shared-dir";;
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   236
			--shared-dir=*)               shared_dir="$optarg";;
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   237
			--without-shared-dir)         shared_dir="";;
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   238
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   239
			--install-dir)                prevp_p="install-dir";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   240
			--install-dir=*)              install_dir="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   241
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   242
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   243
9681
0b6cb7307dfa (svn r13786) -Fix (r13785): reconfigure gave warnings on the newly introduced options.
rubidium
parents: 9680
diff changeset
   244
			--menu-group)                 prevp_p="menu_group";;
0b6cb7307dfa (svn r13786) -Fix (r13785): reconfigure gave warnings on the newly introduced options.
rubidium
parents: 9680
diff changeset
   245
			--menu-group=*)               menu_group="$optarg";;
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   246
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   247
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   248
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   249
			--enable-debug)               enable_debug="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   250
			--enable-debug=*)             enable_debug="$optarg";;
8080
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   251
			--enable-desync-debug)        enable_desync_debug="1";;
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   252
			--enable-desync-debug=*)      enable_desync_debug="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   253
			--enable-profiling)           enable_profiling="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   254
			--enable-profiling=*)         enable_profiling="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   255
			--enable-dedicated)           enable_dedicated="1";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   256
			--enable-dedicated=*)         enable_dedicated="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   257
			--enable-network=*)           enable_network="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   258
			--disable-network)            enable_network="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   259
			--disable-static)             enable_static="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   260
			--enable-static)              enable_static="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   261
			--enable-static=*)            enable_static="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   262
			--disable-translator)         enable_translator="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   263
			--enable-translator)          enable_translator="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   264
			--enable-translator=*)        enable_translator="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   265
			--disable-assert)             enable_assert="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   266
			--enable-assert)              enable_assert="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   267
			--enable-assert=*)            enable_assert="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   268
			--disable-strip)              enable_strip="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   269
			--enable-strip)               enable_strip="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   270
			--enable-strip=*)             enable_strip="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   271
			--disable-universal)          enable_universal="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   272
			--enable-universal)           enable_universal="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   273
			--enable-universal=*)         enable_universal="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   274
			--disable-osx-g5)             enable_osx_g5="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   275
			--enable-osx-g5)              enable_osx_g5="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   276
			--enable-osx-g5=*)            enable_osx_g5="$optarg";;
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   277
			--disable-unicode)            enable_unicode="0";;
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   278
			--enable-unicode)             enable_unicode="2";;
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   279
			--enable-unicode=*)           enable_unicode="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   280
8092
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   281
			--disable-cocoa-quartz)       enable_cocoa_quartz="0";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   282
			--enable-cocoa-quartz)        enable_cocoa_quartz="2";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   283
			--enable-cocoa-quartz=*)      enable_cocoa_quartz="$optarg";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   284
			--disable-cocoa-quickdraw)    enable_cocoa_quickdraw="0";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   285
			--enable-cocoa-quickdraw)     enable_cocoa_quickdraw="2";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   286
			--enable-cocoa-quickdraw=*)   enable_cocoa_quickdraw="$optarg";;
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
   287
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   288
			--with-sdl)                   with_sdl="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   289
			--without-sdl)                with_sdl="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   290
			--with-sdl=*)                 with_sdl="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   291
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   292
			--with-cocoa)                 with_cocoa="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   293
			--without-cocoa)              with_cocoa="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   294
			--with-cocoa=*)               with_cocoa="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   295
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   296
			--with-zlib)                  with_zlib="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   297
			--without-zlib)               with_zlib="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   298
			--with-zlib=*)                with_zlib="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   299
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   300
			--with-png)                   with_png="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   301
			--without-png)                with_png="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   302
			--with-png=*)                 with_png="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   303
			--with-libpng)                with_png="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   304
			--without-libpng)             with_png="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   305
			--with-libpng=*)              with_png="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   306
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   307
			--with-libtimidity)           with_libtimidity="2";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   308
			--without-libtimidity)        with_libtimidity="0";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   309
			--with-libtimidity=*)         with_libtimidity="$optarg";;
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   310
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   311
			--with-freetype)              with_freetype="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   312
			--without-freetype)           with_freetype="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   313
			--with-freetype=*)            with_freetype="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   314
			--with-libfreetype)           with_freetype="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   315
			--without-libfreetype)        with_freetype="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   316
			--with-libfreetype=*)         with_freetype="$optarg";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   317
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   318
			--with-fontconfig)            with_fontconfig="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   319
			--without-fontconfig)         with_fontconfig="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   320
			--with-fontconfig=*)          with_fontconfig="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   321
			--with-libfontconfig)         with_fontconfig="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   322
			--without-libfontconfig)      with_fontconfig="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   323
			--with-libfontconfig=*)       with_fontconfig="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   324
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   325
			--with-icu)                   with_icu="2";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   326
			--without-icu)                with_icu="0";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   327
			--with-icu=*)                 with_icu="$optarg";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   328
			--with-libicu)                with_icu="2";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   329
			--without-libicu)             with_icu="0";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   330
			--with-libicu=*)              with_icu="$optarg";;
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   331
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   332
			--with-psp-config)            with_psp_config="2";;
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   333
			--without-psp-config)         with_psp_config="0";;
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
   334
			--with-psp-config=*)          with_psp_config="$optarg";;
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
   335
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   336
			--with-makedepend)            with_makedepend="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   337
			--without-makedepend)         with_makedepend="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   338
			--with-makedepend=*)          with_makedepend="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   339
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   340
			--with-direct-music)          with_direct_music="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   341
			--without-direct-music)       with_direct_music="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   342
			--with-direct-music=*)        with_direct_music="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   343
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   344
			--with-sort)                  with_sort="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   345
			--without-sort)               with_sort="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   346
			--with-sort=*)                with_sort="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   347
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   348
			--with-iconv)                 with_iconv="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   349
			--without-iconv)              with_iconv="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   350
			--with-iconv=*)               with_iconv="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   351
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   352
			--with-midi=*)                with_midi="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   353
			--with-midi-arg=*)            with_midi_arg="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   354
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   355
			--without-distcc)             with_distcc="0";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   356
			--with-distcc)                with_distcc="2";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   357
			--with-distcc=*)              with_distcc="$optarg";;
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   358
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   359
			--without-ccache)             with_ccache="0";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   360
			--with-ccache)                with_ccache="2";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   361
			--with-ccache=*)              with_ccache="$optarg";;
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   362
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   363
			--without-osx-sysroot)        with_osx_sysroot="0";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   364
			--with-osx-sysroot)           with_osx_sysroot="2";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   365
			--with-osx-sysroot=*)         with_osx_sysroot="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   366
6512
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   367
			--without-application-bundle) with_application_bundle="0";;
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   368
			--with-application-bundle)    with_application_bundle="1";;
2eec32f31a18 (svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents: 6312
diff changeset
   369
			--with-application-bundle=*)  with_application_bundle="$optarg";;
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   370
7294
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
   371
			--without-threads)            with_threads="0";;
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
   372
			--with-threads)               with_threads="1";;
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
   373
			--with-threads=*)             with_threads="$optarg";;
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
   374
5536
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   375
			CC=* | --CC=*)                CC="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   376
			CXX=* | --CXX=*)              CXX="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   377
			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   378
			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   379
5177ac4aa23e (svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents: 5515
diff changeset
   380
			--ignore-extra-parameters)    ignore_extra_parameters="1";;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   381
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   382
			--*)
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   383
				if [ "$ignore_extra_parameters" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   384
					echo "Unknown option $p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   385
					exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   386
				else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   387
					echo "Unknown option $p ignored"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   388
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   389
				;;
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   390
		esac
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   391
	done
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   392
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   393
	if [ -n "$prev_p" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   394
		echo "configure: error: missing argument to --$prev_p"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   395
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   396
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   397
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   398
	# Clean the logfile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   399
	echo "" > $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   400
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   401
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   402
save_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   403
	# Here we save all params, so we can later on do an exact redo of this
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   404
	#  configuration, without having the user to re-input stuff
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   405
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   406
	echo "Running configure with following options:" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   407
	echo "" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   408
6246
75451000349d (svn r9049) -Fix [Config]: when running 'bash configure', make sure automated reconfigures run 'bash configure' too.
truelight
parents: 6244
diff changeset
   409
	configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   410
	for p in $save_params_array; do
5560
94d98c7015ce (svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents: 5559
diff changeset
   411
		eval "v=\"\$$p\""
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   412
		p=`echo "$p" | sed 's~_~-~g;s~\n~~g;s~ ~\\ ~g'`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   413
		# Only save those params that aren't empty
5560
94d98c7015ce (svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents: 5559
diff changeset
   414
		configure="$configure --$p=\"$v\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   415
	done
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   416
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   417
	echo "$configure" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   418
	echo "$configure" > config.cache
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   419
	echo "" >> $config_log
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   420
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   421
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   422
check_params() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   423
	# Some params want to be in full uppercase, else they might not work as
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   424
	# expected.. fix that here
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   425
6078
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   426
	endian=`echo $endian | tr '[a-z]' '[A-Z]'`
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   427
	os=`echo $os | tr '[a-z]' '[A-Z]'`
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   428
	cpu_type=`echo $cpu_type | tr '[a-z]' '[A-Z]'`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   429
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   430
	# Check if all params have valid values
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   431
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   432
	# Endian only allows AUTO, LE and, BE
7424
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   433
	if [ -z "`echo $endian | egrep '^(AUTO|LE|BE|PREPROCESSOR)$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   434
		echo "configure: error: invalid option --endian=$endian"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   435
		echo " Available options are: --endian=[AUTO|LE|BE]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   436
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   437
	fi
7424
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   438
	if [ "$endian" = "PREPROCESSOR" ] && [ "$os" != "OSX" ]; then
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   439
		echo "configure: error: invalid option --endian=$endian"
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   440
		echo " PREPROCESSOR is only available for OSX"
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   441
		exit 1
40212c733e38 (svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents: 7406
diff changeset
   442
	fi
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
   443
	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
   444
	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   445
		echo "configure: error: invalid option --os=$os"
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
   446
		echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   447
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   448
	fi
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   449
	# cpu_type can be either 32 or 64
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
   450
	if [ -z "`echo $cpu_type | egrep '^(32|64|DETECT)$'`" ]; then
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   451
		echo "configure: error: invalid option --cpu-type=$cpu_type"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   452
		echo " Available options are: --cpu-type[=DETECT|32|64]"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   453
		exit 1
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   454
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   455
	# enable_debug should be between 0 and 4
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
   456
	if [ -z "`echo $enable_debug | egrep '^[0123]$'`" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   457
		echo "configure: error: invalid option --enable-debug=$enable_debug"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   458
		echo " Available options are: --enable-debug[=0123]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   459
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   460
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   461
8080
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   462
	# enable_desync_debug should be between 0 and 3
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   463
	if [ -z "`echo $enable_desync_debug | egrep '^[012]$'`" ]; then
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   464
		echo "configure: error: invalid option --enable-desync-debug=$enable_desync_debug"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   465
		echo " Available options are: --enable-desync-debug[=012]"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   466
		exit 1
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   467
	fi
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   468
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   469
	detect_awk
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
   470
9050
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
   471
	detect_os
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
   472
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   473
	check_build
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   474
	check_host
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   476
# We might enable universal builds always on OSX targets.. but currently we don't
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   477
#	if [ "$enable_universal" = "1" ]  && [ "$os" != "OSX" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   478
	if [ "$enable_universal" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   479
		enable_universal="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   480
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   481
	if [ "$enable_universal" = "2" ]  && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   482
		log 1 "configure: error: --enable-universal only works on OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   483
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   484
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   485
	if [ "$enable_universal" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   486
		log 1 "checking universal build... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   487
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   488
		log 1 "checking universal build... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   489
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   490
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   491
	# Already detected by check_build
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   492
	log 1 "checking build cc... $cc_build"
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   493
	log 1 "checking host cc... $cc_host"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   494
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   495
	check_cxx_build
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
   496
	check_cxx_host
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   497
	check_windres
6082
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   498
	if [ "$enable_strip" != "0" ]; then
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   499
		check_strip
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   500
	else
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   501
		log 1 "checking strip... disabled"
dc7b5c71799f (svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents: 6081
diff changeset
   502
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   503
	check_lipo
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   504
	check_makedepend
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
   505
	detect_cputype
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   506
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   507
	if [ "$enable_static" = "1" ]; then
8147
ddfb264d69ad (svn r11709) -Fix [FS#1385 FS#1386]: [OSX] Compiles on Leopard with the default settings
bjarni
parents: 8128
diff changeset
   508
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   509
			enable_static="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   510
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   511
			enable_static="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   512
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   513
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   514
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   515
	if [ "$enable_static" != "0" ]; then
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   516
		log 1 "checking static... yes"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   517
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   518
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   519
			log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   520
			log 1 "WARNING: use static at your own risk on this platform"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   521
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   522
			sleep 5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   523
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   524
	else
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
   525
		log 1 "checking static... no"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   526
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   527
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   528
	if [ "$enable_unicode" = "1" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   529
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   530
			enable_unicode="2"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   531
		else
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   532
			enable_unicode="0"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   533
		fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   534
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   535
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   536
	if [ "$enable_unicode" != "0" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   537
		log 1 "checking unicode... yes"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   538
	else
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   539
		log 1 "checking unicode... no"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   540
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
   541
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   542
	# Show what we configured
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   543
	if [ "$enable_debug" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   544
		log 1 "using debug level... no"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   545
	elif [ "$enable_profiling" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   546
		log 1 "using debug level... profiling (debug level $enable_debug)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   547
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   548
		log 1 "using debug level... level $enable_debug"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   549
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   550
8080
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   551
	if [ "$enable_desync_debug" = "0" ]; then
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   552
		log 1 "using desync debug level... no"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   553
	else
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   554
		log 1 "using desync debug level... level $enable_desync_debug"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   555
		log 1 "WARNING: desync debug functions slow down the game considerably."
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   556
		log 1 "WARNING: use only when you are instructed to do so"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   557
		log 1 "         or when you know what you are doing."
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   558
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   559
		sleep 5
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   560
	fi
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
   561
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   562
	detect_sdl
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   563
	detect_cocoa
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   564
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   565
	if [ "$enable_dedicated" != "0" ]; then
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
   566
		log 1 "checking GDI video driver... dedicated server, skipping"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   567
		log 1 "checking dedicated... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   568
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   569
		if [ "$enable_network" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   570
			log 1 "WARNING: compiling a dedicated server without network is pointless"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   571
			sleep 5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   572
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   573
	else
5760
483b8c081776 (svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents: 5753
diff changeset
   574
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   575
			log 1 "checking GDI video driver... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   576
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   577
			log 1 "checking GDI video driver... not Windows, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   578
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   579
5760
483b8c081776 (svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents: 5753
diff changeset
   580
		if [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   581
			log 1 "WARNING: no video driver found, building dedicated only"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   582
			enable_dedicated="1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   583
			sleep 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   584
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   585
			log 1 "checking dedicated... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   586
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   587
			log 1 "checking dedicated... not selected"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   588
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   589
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   590
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   591
	if [ "$enable_network" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   592
		log 1 "checking network... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   593
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   594
		log 1 "checking network... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   595
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   596
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   597
	if [ "$enable_translator" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   598
		log 1 "checking translator... debug"
5485
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   599
		# -t shows TODO items, normally they are muted
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   600
		strgen_flags="-t"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   601
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   602
		log 1 "checking translator... no"
5485
fcd57778b940 (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents: 5479
diff changeset
   603
		strgen_flags=""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   604
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   605
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   606
	if [ "$enable_assert" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   607
		log 1 "checking assert... enabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   608
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   609
		log 1 "checking assert... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   610
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   611
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   612
	detect_zlib
10265
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   613
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   614
	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   615
		log 1 "WARNING: zlib was not detected or disabled"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   616
		log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean many features (like"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   617
		log 1 "WARNING: loading most savegames/scenarios, joining most servers, loading"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   618
		log 1 "WARNING: heightmaps, using PNG or using fonts, ...) will be disabled."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   619
		log 1 "WARNING: We strongly suggest you to install zlib."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   620
		sleep 5
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   621
	fi
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
   622
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   623
	detect_png
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   624
	detect_freetype
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   625
	detect_fontconfig
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
   626
	detect_icu
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
   627
	detect_pspconfig
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
   628
	detect_libtimidity
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   629
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   630
	if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   631
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   632
			if [ "$with_direct_music" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   633
				log 1 "configure: error: direct-music is only supported on Win32 targets"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   634
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   635
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   636
			with_direct_music="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   637
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   638
			log 1 "checking direct-music... not Windows, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   639
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   640
			check_direct_music
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   641
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   642
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   643
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   644
	detect_sort
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   645
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   646
	if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   647
		endian="PREPROCESSOR"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   648
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   649
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   650
	log 1 "checking endianess... $endian"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   651
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   652
	# Suppress language errors when there is a version defined, indicating a release
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   653
	#  It just isn't pretty if any release produces warnings in the languages.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   654
	if [ -f "$ROOT_DIR/version" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   655
		lang_suppress="yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   656
		log 1 "suppress language errors... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   657
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   658
		lang_suppress=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   659
		log 1 "suppress language errors... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   660
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   661
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   662
	if [ "$enable_debug" = "0" ] && [ "$enable_profiling" = "0" ] && [ "$enable_strip" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   663
		if [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   664
			strip_arg="--strip-all --strip-unneeded --remove-section .comment"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   665
		elif [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   666
			strip_arg=""
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   667
		elif [ "$os" = "OS2" ]; then
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   668
			strip_arg=""
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   669
			# OS2 uses strip via gcc, because it needs to be feed to emxbind
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
   670
			LDFLAGS="$LDFLAGS -s"
6230
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   671
		elif [ "$os" = "SUNOS" ]; then
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   672
			# The GNU strip does know -s, the non-GNU doesn't
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   673
			#  So try to detect it (in a bit of an ugly way)
12b970a7fed6 (svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents: 6228
diff changeset
   674
			strip_arg="`$strip -s strip.test 2>/dev/null && echo \"-s\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   675
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   676
			strip_arg="-s"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   677
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   678
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   679
		log 1 "checking stripping... $strip $strip_arg"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   680
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   681
		strip=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   682
		log 1 "checking stripping... skipped"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   683
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   684
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   685
	if [ "$with_distcc" = "0" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   686
		log 1 "checking distcc... no"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   687
	elif [ "$with_distcc" = "1" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   688
		with_distcc="0"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   689
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   690
		log 1 "checking distcc... no (only used when forced)"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   691
	elif [ "$with_distcc" = "2" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   692
		distcc="distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   693
	else
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   694
		distcc="$with_distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   695
	fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   696
	if [ "$with_distcc" != "0" ]; then
8410
6099da08c645 (svn r11980) -Fix: newer versions of cut do not accept field index 0
smatz
parents: 8289
diff changeset
   697
		res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 1-6`"
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   698
		if [ "$res" != "distcc" ]; then
6851
0a0a094fb9f1 (svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
rubidium
parents: 6850
diff changeset
   699
			distcc=""
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   700
			log 1 "checking distcc... no"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   701
			if [ "$with_distcc" = "2" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   702
				log 1 "configure: error: no distcc detected, but was forced to be used"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   703
				exit 1
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   704
			fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   705
			if [ "$with_distcc" != "1" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   706
				log 1 "configure: error: '$with_distcc' doesn't seem a distcc to me"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   707
				exit 1
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   708
			fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   709
		fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   710
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   711
		log 1 "checking distcc... $distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   712
	fi
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
   713
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   714
	if [ "$with_ccache" = "0" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   715
		log 1 "checking ccache... no"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   716
	elif [ "$with_ccache" = "1" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   717
		with_ccache="0"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   718
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   719
		log 1 "checking ccache... no (only used when forced)"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   720
	elif [ "$with_ccache" = "2" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   721
		ccache="ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   722
	else
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   723
		ccache="$with_ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   724
	fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   725
	if [ "$with_ccache" != "0" ]; then
8410
6099da08c645 (svn r11980) -Fix: newer versions of cut do not accept field index 0
smatz
parents: 8289
diff changeset
   726
		res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 1-6`"
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   727
		if [ "$res" != "ccache" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   728
			ccache=""
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   729
			log 1 "checking ccache... no"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   730
			if [ "$with_ccache" = "2" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   731
				log 1 "configure: error: no ccache detected, but was forced to be used"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   732
				exit 1
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   733
			fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   734
			if [ "$with_ccache" != "1" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   735
				log 1 "configure: error: '$with_ccache' doesn't seem a ccache to me"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   736
				exit 1
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   737
			fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   738
		fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   739
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   740
		log 1 "checking ccache... $ccache"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   741
	fi
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
   742
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   743
	if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   744
		if [ "$with_osx_sysroot" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   745
			with_osx_sysroot="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   746
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   747
			log 1 "checking OSX sysroot... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   748
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   749
			log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   750
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   751
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   752
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   753
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   754
	if [ "$with_osx_sysroot" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   755
		if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   756
			log 1 "checking OSX sysroot... $with_osx_sysroot"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   757
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   758
			# If autodetect and no universal, use system default
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   759
			if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   760
				log 1 "checking OSX sysroot... no (use system default)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   761
				with_osx_sysroot="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   762
			else
5541
f034f6f60d88 (svn r7883) It's spelled 'automatically'
tron
parents: 5539
diff changeset
   763
				log 1 "checking OSX sysroot... automatically"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   764
				with_osx_sysroot="3"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   765
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   766
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   767
	else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   768
		if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   769
			log 1 "checking OSX sysroot... no (use system default)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   770
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   771
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   772
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   773
	if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   774
		if [ "$with_application_bundle" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   775
			with_application_bundle="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   776
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   777
			log 1 "checking OSX application bundle... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   778
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   779
			log 1 "configure: error: --with-application-bundle only works if OSX is the target"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   780
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   781
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   782
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   783
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   784
	if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   785
		OSXAPP="OpenTTD.app"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   786
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   787
		OSXAPP=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   788
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   789
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   790
	if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   791
		# Test on G5
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   792
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   793
		if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   794
			log 1 "detecting G5... yes (forced)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   795
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   796
			# First, are we a real OSX system, else we can't detect it
6078
36a7f0e75ac4 (svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents: 6077
diff changeset
   797
			native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   798
			# If $host doesn't match $build , we are cross-compiling
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
   799
			if [ -n "$native" ] && [ "$build" = "$host" ]; then
6312
738abf8f57a4 (svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).
rubidium
parents: 6300
diff changeset
   800
				$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   801
				res=`./G5_detector`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   802
				rm -f G5_detector
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   803
				if [ -n "$res" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   804
					# This is G5, add flags for it
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   805
					enable_osx_g5="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   806
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   807
					log 1 "detecting G5... yes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   808
				else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   809
					enable_osx_g5="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   810
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   811
					log 1 "detecting G5... no"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   812
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   813
			else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   814
				enable_osx_g5="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   815
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   816
				log 1 "detecting G5... no (cross-compiling)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   817
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   818
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   819
	else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   820
		if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   821
			log 1 "configure: error: OSX G5 selected, but not compiling for OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   822
			log 1 "configure: error: either select OSX as OS, or deselect OSX G5"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   823
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   824
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   825
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   826
	fi
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   827
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   828
	if [ -n "$released_version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   829
		log 1 "checking revision... release ($released_version)"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   830
		if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   831
			log 1 "WARNING: overriding of the revision is NOT possible for releases"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   832
			log 1 "WARNING: the given revision is IGNORED"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   833
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   834
			sleep 5
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   835
		fi
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   836
		revision=$released_version
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   837
	else
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   838
		if [ -n "$revision" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   839
			log 1 "checking revision... $revision"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   840
			log 1 "WARNING: we do not advise you to use this setting"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   841
			log 1 "WARNING: in most cases it is not safe for network use"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   842
			log 1 "WARNING: USE WITH CAUTION!"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   843
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   844
			sleep 5
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   845
		elif [ -f "$ROOT_DIR/version" ]; then
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   846
			revision="`cat $ROOT_DIR/version`"
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   847
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   848
			log 1 "checking revision... $revision"
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   849
		elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help`" ]; then
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   850
			revision=""
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   851
			log 1 "checking revision... svn detection"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   852
		elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help`" ]; then
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   853
			revision=""
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   854
			log 1 "checking revision... git detection"
7618
21fddd467b0f (svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents: 7564
diff changeset
   855
		elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help`" ]; then
21fddd467b0f (svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents: 7564
diff changeset
   856
			revision=""
21fddd467b0f (svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents: 7564
diff changeset
   857
			log 1 "checking revision... hg detection"
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   858
		else
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   859
			revision=""
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   860
			log 1 "checking revision... no detection"
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   861
			log 1 "WARNING: there is no means to determine the version."
10200
23946c066035 (svn r14413) -Fix: when no revision detected, the error didn't indicate 'mercurial' was accepted as source too (patch not by Sacro)
truebrain
parents: 10076
diff changeset
   862
			log 1 "WARNING: please use a subversion, mercurial, or git checkout of OpenTTD."
23946c066035 (svn r14413) -Fix: when no revision detected, the error didn't indicate 'mercurial' was accepted as source too (patch not by Sacro)
truebrain
parents: 10076
diff changeset
   863
			log 1 "WARNING: you can only join game servers that have been compiled without"
23946c066035 (svn r14413) -Fix: when no revision detected, the error didn't indicate 'mercurial' was accepted as source too (patch not by Sacro)
truebrain
parents: 10076
diff changeset
   864
			log 1 "WARNING:   version detection."
7220
f44697e71145 (svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
rubidium
parents: 7204
diff changeset
   865
			log 1 "WARNING: there is a great chance you desync."
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   866
			log 1 "WARNING: USE WITH CAUTION!"
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   867
6812
a7000b1ba9d9 (svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents: 6811
diff changeset
   868
			sleep 5
6811
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   869
		fi
b8a89042096a (svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents: 6673
diff changeset
   870
	fi
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   871
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   872
	if [ "$doc_dir" = "1" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   873
		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   874
			doc_dir="share/doc/openttd"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   875
		else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   876
			doc_dir="$data_dir/docs"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   877
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   878
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   879
		doc_dir="`echo $doc_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   880
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   881
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   882
	if [ "$icon_theme_dir" = "1" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   883
		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   884
			icon_theme_dir="share/icons/hicolor"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   885
		else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   886
			icon_theme_dir=""
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   887
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   888
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   889
		icon_theme_dir="`echo $icon_theme_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   890
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   891
6930
19dca58600d2 (svn r10183) -Fix (r10182): some bashism sneaked in.
rubidium
parents: 6929
diff changeset
   892
	if [ "$personal_dir" = "1" ]; then
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   893
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   894
			personal_dir="OpenTTD"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   895
		elif [ "$os" = "OSX" ]; then
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   896
			personal_dir="Documents/OpenTTD"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   897
		else
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   898
			personal_dir=".openttd"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   899
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   900
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   901
		personal_dir="`echo $personal_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   902
	fi
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   903
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   904
	if [ "$shared_dir" = "1" ]; then
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   905
		# we are using default values
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   906
		if [ "$os" = "OSX" ]; then
8289
6eaeffc28704 (svn r11853) -Fix [r11837]: [OSX] reconfigure killed the space in shared-dir
bjarni
parents: 8273
diff changeset
   907
			shared_dir="/Library/Application\\\\ Support/OpenTTD"
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   908
		else
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   909
			shared_dir=""
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   910
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   911
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   912
		shared_dir="`echo $shared_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   913
	fi
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   914
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   915
	if [ "$man_dir" = "1" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   916
		# add manpage on UNIX systems
9695
dc3599ef2d6d (svn r13802) -Fix(r13801): a few small typos
skidd13
parents: 9694
diff changeset
   917
		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   918
			man_dir="share/man/man6"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   919
		else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   920
			man_dir=""
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   921
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   922
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   923
		man_dir="`echo $man_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   924
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   925
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   926
	if [ "$menu_dir" = "1" ]; then
9687
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   927
		# add a freedesktop menu item only for some UNIX systems
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   928
		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   929
			menu_dir="share/applications"
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   930
		else
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   931
			menu_dir=""
9687
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   932
		fi
10217
067947c58b30 (svn r14440) -Fix [FS#1802]: support for spaces in directories passed to ./configure.
rubidium
parents: 10200
diff changeset
   933
	else
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
   934
		menu_dir="`echo $menu_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
9687
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   935
	fi
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   936
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
   937
	# "set_universal_binary_flags" needs to be before "detect_iconv"
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
   938
	set_universal_binary_flags
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
   939
	detect_iconv
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
   940
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   941
	if [ -n "$personal_dir" ]
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   942
	then
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   943
		log 1 "personal home directory... $personal_dir"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   944
	else
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   945
		log 1 "personal home directory... none"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   946
	fi
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   947
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   948
	if [ -n "$shared_dir" ]
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   949
	then
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   950
		log 1 "shared data directory... $shared_dir"
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   951
	else
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   952
		log 1 "shared data directory... none"
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   953
	fi
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
   954
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   955
	if [ -n "$install_dir" ]
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   956
	then
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   957
		log 1 "installation directory... $install_dir"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   958
	else
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   959
		log 1 "installation directory... none"
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
   960
	fi
9685
e2ccbbfd3583 (svn r13791) -Fix(r13790): Don refer to variables when their value isn't set as expected
skidd13
parents: 9684
diff changeset
   961
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   962
	if [ -n "$icon_theme_dir" ]
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   963
	then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   964
		log 1 "icon theme directory... $icon_theme_dir"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   965
	else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   966
		log 1 "icon theme directory... none"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   967
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   968
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   969
	if [ -n "$man_dir" ]
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   970
	then
9695
dc3599ef2d6d (svn r13802) -Fix(r13801): a few small typos
skidd13
parents: 9694
diff changeset
   971
		log 1 "manual page directory... $man_dir"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   972
	else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   973
		log 1 "manual page directory... none"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   974
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
   975
9687
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   976
	if [ -n "$menu_dir" ]
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   977
	then
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   978
		log 1 "menu item directory... $menu_dir"
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   979
	else
07373ab2ac06 (svn r13793) -Codechange: Unify the dir checking in config.lib
skidd13
parents: 9686
diff changeset
   980
		log 1 "menu item directory... none"
9685
e2ccbbfd3583 (svn r13791) -Fix(r13790): Don refer to variables when their value isn't set as expected
skidd13
parents: 9684
diff changeset
   981
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   982
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   983
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   984
make_cflags_and_ldflags() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   985
	# General CFlags for BUILD
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   986
	CFLAGS_BUILD=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   987
	# General CFlags for HOST
7564
fa54ab680589 (svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents: 7424
diff changeset
   988
	CFLAGS="$CFLAGS -D$os"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   989
	# CFlags for HOST and C-Compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   990
	CC_FLAGS=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   991
	# Libs to compile. In fact this is just LDFLAGS
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   992
	LIBS="-lstdc++"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   993
	# LDFLAGS used for HOST
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   994
	LDFLAGS="$LDFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   995
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   996
	if [ $enable_debug = 0 ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
   997
		# No debug, add default stuff
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
   998
		OBJS_SUBDIR="release"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
   999
		if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1000
			# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
7204
ef8181ff2c1e (svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents: 7045
diff changeset
  1001
			CFLAGS="-O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic $CFLAGS"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1002
		else
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1003
			if [ "$os" = "MORPHOS" ]; then
7204
ef8181ff2c1e (svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents: 7045
diff changeset
  1004
				CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
6046
67e9b9e2ef98 (svn r8776) [MorhpOS] -Fix: LDFLAGS needs -noixemul too
truelight
parents: 6035
diff changeset
  1005
				LDFLAGS="$LDFLAGS -noixemul"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1006
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1007
7204
ef8181ff2c1e (svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents: 7045
diff changeset
  1008
			CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1009
		fi
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1010
	else
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1011
		OBJS_SUBDIR="debug"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1012
10024
2e00ada672d1 (svn r14183) -Fix: "optimalization" is not a word
peter1138
parents: 9933
diff changeset
  1013
		# Each debug level reduces the optimization by a bit
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1014
		if [ $enable_debug -ge 1 ]; then
9109
f147b35e37c5 (svn r12969) -Codechange: remove a completely pointless file.
rubidium
parents: 9097
diff changeset
  1015
			CFLAGS="$CFLAGS -g -D_DEBUG -D_FORTIFY_SOURCE=2"
5979
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1016
			if [ "$os" = "PSP" ]; then
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1017
				CFLAGS="$CFLAGS -G0"
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1018
			fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1019
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1020
		if [ $enable_debug -ge 2 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1021
			CFLAGS="$CFLAGS -fno-inline"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1022
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1023
		if [ $enable_debug -ge 3 ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1024
			CFLAGS="$CFLAGS -O0"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1025
		else
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1026
			CFLAGS="$CFLAGS -O2"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1027
		fi
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1028
	fi
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1029
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1030
	if [ "$enable_profiling" != "0" ]; then
5551
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1031
		CFLAGS="$CFLAGS -p"
bfd85f0c196d (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents: 5549
diff changeset
  1032
		LDFLAGS="$LDFLAGS -pg"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1033
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1034
7294
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
  1035
	if [ "$with_threads" = "0" ]; then
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
  1036
		CFLAGS="$CFLAGS -DNO_THREADS"
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
  1037
	fi
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
  1038
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1039
	if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1040
		# Enable some things only for certain ICC versions
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1041
		cc_version=`$cc_host -dumpversion | cut -c 1-4`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1042
7294
b53e8aae866c (svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents: 7220
diff changeset
  1043
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1044
		if [ "$cc_version" = "10.1" ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1045
			CFLAGS="$CFLAGS -Wno-multichar"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1046
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1047
	else
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1048
		# Enable some things only for certain GCC versions
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1049
		cc_version=`$cc_host -dumpversion | cut -c 1,3`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1050
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1051
		if [ $cc_version -ge 29 ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1052
			CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1053
			CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
9137
9f8d8181e1c4 (svn r12998) -Fix: -Wredundant_decls sees "friend" declarations as redundant declarations in GCC 2.95, so only use if for GCC >= 3.
rubidium
parents: 9117
diff changeset
  1054
			CFLAGS="$CFLAGS -Wno-uninitialized"
7406
69bfb4b909e8 (svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents: 7330
diff changeset
  1055
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1056
			CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1057
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1058
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1059
		gcc295=""
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1060
		if [ "$cc_version" = 29 ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1061
			# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1062
			#  need a lovely hack there to make it compile correctly.
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1063
			gcc295="1"
9577
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1064
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1065
			# Disable warnings about unused variables when
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1066
			# compiling with asserts disabled
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1067
			if [ $enable_assert -eq 0 ]; then
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1068
				CFLAGS="$CFLAGS -Wno-unused"
aad15c2e26cd (svn r13609) -Codechange: silence warnings about unused variables for gcc2 builds without asserts
smatz
parents: 9436
diff changeset
  1069
			fi
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1070
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1071
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1072
		if [ $cc_version -ge 30 ]; then
9097
b6d5a834e4cd (svn r12957) -Codechange: do not misuse snprintf when you just want to copy a string, also use DEBUG instead of fprintf in one case.
rubidium
parents: 9072
diff changeset
  1073
			CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
9137
9f8d8181e1c4 (svn r12998) -Fix: -Wredundant_decls sees "friend" declarations as redundant declarations in GCC 2.95, so only use if for GCC >= 3.
rubidium
parents: 9117
diff changeset
  1074
			CFLAGS="$CFLAGS -Wredundant-decls"
9436
2eabc2c8ac08 (svn r13351) -Codechange: disable warnings about unused variable for builds without asserts
smatz
parents: 9137
diff changeset
  1075
			# Do not warn about unused variables when building without asserts
2eabc2c8ac08 (svn r13351) -Codechange: disable warnings about unused variable for builds without asserts
smatz
parents: 9137
diff changeset
  1076
			if [ $enable_assert -eq 0 ]; then
2eabc2c8ac08 (svn r13351) -Codechange: disable warnings about unused variable for builds without asserts
smatz
parents: 9137
diff changeset
  1077
				CFLAGS="$CFLAGS -Wno-unused-variable"
2eabc2c8ac08 (svn r13351) -Codechange: disable warnings about unused variable for builds without asserts
smatz
parents: 9137
diff changeset
  1078
			fi
8161
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1079
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1080
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1081
		if [ $cc_version -ge 34 ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1082
			CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1083
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1084
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1085
		if [ "$os" = "CYGWIN" ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1086
			CFLAGS="$CFLAGS -mwin32"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1087
			LDFLAGS="$LDFLAGS -mwin32"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1088
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1089
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1090
			CFLAGS="$CFLAGS -mno-cygwin"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1091
			LDFLAGS="$LDFLAGS -mno-cygwin"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1092
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1093
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1094
		if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1095
			LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1096
			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1097
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1098
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1099
		# GCC 4.0+ complains about that we break strict-aliasing.
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1100
		#  On most places we don't see how to fix it, and it doesn't
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1101
		#  break anything. So disable strict-aliasing to make the
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1102
		#  compiler all happy.
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1103
		if [ $cc_version -ge 40 ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1104
			CFLAGS="$CFLAGS -fno-strict-aliasing"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1105
		fi
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1106
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1107
		# GCC 4.2+ automatically assumes that signed overflows do
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1108
		# not occur in signed arithmetics, whereas we are not
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1109
		# sure that they will not happen. It furthermore complains
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1110
		# about it's own optimized code in some places.
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1111
		if [ $cc_version -ge 42 ]; then
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1112
			CFLAGS="$CFLAGS -fno-strict-overflow"
59b7bb15cb21 (svn r11723) -Feature: add initial support for Intel C Compiler on linux
skidd13
parents: 8147
diff changeset
  1113
		fi
8128
6856dfdd65f7 (svn r11689) -Fix: compilation error and most of warnings for gcc 4.3
smatz
parents: 8092
diff changeset
  1114
	fi
6856dfdd65f7 (svn r11689) -Fix: compilation error and most of warnings for gcc 4.3
smatz
parents: 8092
diff changeset
  1115
7045
5d5306f074db (svn r10310) -Fix: Trunk can now be built on OS/2 :)
orudge
parents: 6980
diff changeset
  1116
	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1117
		LIBS="$LIBS -lpthread"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1118
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1119
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1120
	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1121
		LIBS="$LIBS -lc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1122
	fi
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1123
	if [ "$os" = "WINCE" ]; then
5762
f7f13553f881 (svn r8313) [WinCE] -Fix: -lws2 wasn't included in libraries, so network couldn't be linked
truelight
parents: 5760
diff changeset
  1124
		LIBS="$LIBS -lcoredll -lcorelibc -laygshell -lws2 -e WinMainCRTStartup"
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1125
	fi
5960
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
  1126
	if [ "$os" = "PSP" ]; then
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
  1127
		CFLAGS="$CFLAGS -I`$psp_config -p`/include"
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
  1128
		LDFLAGS="$LDFLAGS -L`$psp_config -p`/lib"
5979
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1129
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1130
		CFLAGS="$CFLAGS -fno-exceptions -fno-rtti -D_PSP_FW_VERSION=150"
8209c942efd5 (svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents: 5961
diff changeset
  1131
		LIBS="$LIBS -D_PSP_FW_VERSION=150 -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser -lpspkernel -lm"
5960
38628fa068a0 (svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents: 5958
diff changeset
  1132
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1133
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1134
	if [ "$os" = "MORPHOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1135
		# -Wstrict-prototypes generates much noise because of system headers
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1136
		CFLAGS="$CFLAGS -Wno-strict-prototypes"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1137
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1138
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1139
	if [ "$os" = "OPENBSD" ]; then
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1140
		LIBS="$LIBS -pthread"
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1141
	fi
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1142
7719
4be4d9bca5de (svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents: 7687
diff changeset
  1143
	if [ "$os" = "FREEBSD" ]; then
4be4d9bca5de (svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents: 7687
diff changeset
  1144
		LIBS="$LIBS -lpthread"
4be4d9bca5de (svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents: 7687
diff changeset
  1145
	fi
4be4d9bca5de (svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents: 7687
diff changeset
  1146
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1147
	if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1148
		LDFLAGS="$LDFLAGS -framework Cocoa"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1149
		if [ "$enable_dedicated" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1150
			LIBS="$LIBS -framework QuickTime"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1151
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1152
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1153
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1154
	if [ "$os" = "BEOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1155
		LIBS="$LIBS -lmidi -lbe"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1156
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1157
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1158
	# Most targets act like UNIX, just with some additions
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1159
	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1160
		CFLAGS="$CFLAGS -DUNIX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1161
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1162
	# And others like Windows
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1163
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1164
		CFLAGS="$CFLAGS -DWIN"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1165
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1166
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1167
	if [ -n "$sdl_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1168
		CFLAGS="$CFLAGS -DWITH_SDL"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1169
		CFLAGS="$CFLAGS `$sdl_config --cflags`"
6249
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1170
		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1171
			if [ "$enable_static" != "0" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1172
				LIBS="$LIBS `$sdl_config --static-libs`"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1173
			else
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1174
				LIBS="$LIBS `$sdl_config --libs`"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  1175
			fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1176
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1177
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1178
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1179
	if [ "$with_cocoa" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1180
		CFLAGS="$CFLAGS -DWITH_COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1181
		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
8092
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1182
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1183
		if [ "$enable_cocoa_quartz" != "0" ]; then
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1184
			CFLAGS="$CFLAGS -DENABLE_COCOA_QUARTZ"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1185
		fi
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1186
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1187
		if [ "$enable_cocoa_quickdraw" != "0" ]; then
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1188
			CFLAGS="$CFLAGS -DENABLE_COCOA_QUICKDRAW"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1189
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1190
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1191
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1192
	if [ "$with_zlib" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1193
		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1194
			LIBS="$LIBS $zlib"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1195
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1196
			LIBS="$LIBS -lz"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1197
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1198
		CFLAGS="$CFLAGS -DWITH_ZLIB"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1199
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1200
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1201
	if [ -n "$png_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1202
		CFLAGS="$CFLAGS -DWITH_PNG"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1203
		CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1204
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1205
		# The extra flags are unneeded for latest libpng-config, but some versions are so broken...
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1206
		if [ "$enable_static" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1207
			if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1208
				LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1209
			else
6242
cd6bbee8f290 (svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents: 6241
diff changeset
  1210
				LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' '  '`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1211
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1212
		else
6242
cd6bbee8f290 (svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents: 6241
diff changeset
  1213
			LIBS="$LIBS `$png_config --ldflags | tr '\n\r' '  '`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1214
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1215
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1216
6241
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1217
	if [ -n "$fontconfig_config" ]; then
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1218
		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1219
		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1220
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1221
		if [ "$enable_static" != "0" ]; then
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1222
			if [ "$os" = "OSX" ]; then
6243
80b367ea1679 (svn r9046) -Fix r9041: added a comment to make clear why we don't use --prefix here
truelight
parents: 6242
diff changeset
  1223
				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
6244
14efce228eae (svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents: 6243
diff changeset
  1224
				# 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
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  1225
				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s~-lfontconfig~~`"
6241
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1226
			else
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1227
				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1228
			fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1229
		else
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1230
			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1231
		fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1232
	fi
98660bcb4cbe (svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents: 6238
diff changeset
  1233
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1234
	if [ -n "$freetype_config" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1235
		CFLAGS="$CFLAGS -DWITH_FREETYPE"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1236
		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1237
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1238
		if [ "$enable_static" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1239
			if [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1240
				LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1241
			else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1242
				# Is it possible to do static with freetype, if so: how?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1243
				LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1244
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1245
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1246
			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1247
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1248
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1249
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1250
	if [ -n "$icu_config" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1251
		CFLAGS="$CFLAGS -DWITH_ICU"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1252
		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1253
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1254
		LIBS="$LIBS `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1255
	fi
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1256
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  1257
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1258
	if [ "$with_direct_music" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1259
		CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
6191
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1260
		# GCC 4.0+ doesn't like the DirectX includes (gives tons of
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1261
		#  warnings on it we won't be able to fix). For now just
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1262
		#  suppress those warnings.
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1263
		if [ $cc_version -ge 40 ]; then
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1264
			CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
98bbe5ce8100 (svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents: 6189
diff changeset
  1265
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1266
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1267
6035
9009f472b356 (svn r8758) -Fix r8757: wrong variable to check libtimidity on if it is found or not
truelight
parents: 6034
diff changeset
  1268
	if [ -n "$libtimidity" ]; then
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1269
		if [ "$enable_static" != "0" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1270
			LIBS="$LIBS $libtimidity"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1271
		else
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1272
			LIBS="$LIBS -ltimidity"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1273
		fi
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1274
		CFLAGS="$CFLAGS -DLIBTIMIDITY"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1275
	fi
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1276
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1277
	if [ "$with_iconv" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1278
		CFLAGS="$CFLAGS -DWITH_ICONV"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1279
		LIBS="$LIBS -liconv"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1280
		if [ "$with_iconv" != "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1281
			CFLAGS="$CFLAGS -I$with_iconv/include"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1282
			LIBS="$LIBS -L$with_iconv/lib"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1283
		fi
7839
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  1284
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  1285
		if [ "$have_broken_iconv" != "no" ]; then
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  1286
			CFLAGS="$CFLAGS -DHAVE_BROKEN_ICONV"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  1287
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1288
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1289
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1290
	if [ -n "$with_midi" ]; then
5549
85d90ea63b6f (svn r7922) -Fix: bad escaping in CFLAGS
glx
parents: 5541
diff changeset
  1291
		CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1292
	fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1293
	if [ -n "$with_midi_arg" ]; then
5549
85d90ea63b6f (svn r7922) -Fix: bad escaping in CFLAGS
glx
parents: 5541
diff changeset
  1294
		CFLAGS="$CFLAGS -DMIDI_ARG=\\\\\"$with_midi_arg\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1295
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1296
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1297
	if [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1298
		CFLAGS="$CFLAGS -DDEDICATED"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1299
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1300
6228
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
  1301
	if [ "$enable_unicode" != "0" ]; then
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
  1302
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
  1303
	fi
a7b26082b00d (svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents: 6220
diff changeset
  1304
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1305
	if [ "$enable_network" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1306
		CFLAGS="$CFLAGS -DENABLE_NETWORK"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1307
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1308
		if [ "$os" = "BEOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1309
			LDFLAGS="$LDFLAGS -lbind -lsocket"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1310
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1311
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1312
		if [ "$os" = "SUNOS" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1313
			LDFLAGS="$LDFLAGS -lnsl -lsocket"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1314
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1315
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1316
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1317
	if [ "$enable_static" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1318
		# OSX can't handle -static in LDFLAGS
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1319
		if [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1320
			LDFLAGS="$LDFLAGS -static"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1321
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1322
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1323
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1324
	if [ "$enable_assert" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1325
		CFLAGS="$CFLAGS -DNDEBUG"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1326
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1327
8080
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1328
	if [ "$enable_desync_debug" = "1" ]; then
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1329
		CFLAGS="$CFLAGS -DDEBUG_DUMP_COMMANDS"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1330
	fi
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1331
	if [ "$enable_desync_debug" = "2" ]; then
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1332
		CFLAGS="$CFLAGS -DRANDOM_DEBUG"
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1333
	fi
6927201dcff3 (svn r11641) -Add: configure time parameter to enable some desync debugging functionality.
rubidium
parents: 8042
diff changeset
  1334
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1335
	if [ "$enable_osx_g5" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1336
		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1337
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1338
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
  1339
	if [ -n "$personal_dir" ]; then
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
  1340
		CFLAGS="$CFLAGS -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\\\\"$personal_dir\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1341
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1342
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  1343
	if [ -n "$shared_dir" ]; then
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  1344
		CFLAGS="$CFLAGS -DWITH_SHARED_DIR -DSHARED_DIR=\\\\\"$shared_dir\\\\\""
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  1345
	fi
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  1346
6929
56470c1b8a66 (svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents: 6918
diff changeset
  1347
	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1348
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1349
	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1350
	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1351
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1352
	# Makedepend doesn't like something like: -isysroot /OSX/blabla
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1353
	#  so convert it to: -isysroot -OSX/blabla. makedepend just ignores
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1354
	#  any - command it doesn't know, so we are pretty save.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1355
	# Lovely hackish, not?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1356
	# Btw, this almost always comes from outside the configure, so it is
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1357
	#  not something we can control.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1358
	if [ "$with_makedepend" != "0" ]; then
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  1359
		cflags_makedep="` echo "$CFLAGS" | sed 's~ /~ -~g'`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1360
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1361
		makedepend=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1362
	fi
6850
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1363
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1364
	if [ "$with_distcc" != "0" ]; then
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1365
		cc_host="$distcc $cc_host"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1366
		cxx_host="$distcc $cxx_host"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1367
		log 1 ""
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1368
		log 1 " NOTICE: remind yourself to use 'make -jN' to make use of distcc"
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1369
		log 1 ""
aa03bfde6692 (svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents: 6812
diff changeset
  1370
	fi
6918
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1371
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1372
	if [ "$with_ccache" != "0" ]; then
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1373
		cc_host="$ccache $cc_host"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1374
		cxx_host="$ccache $cxx_host"
43b7ded86b20 (svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents: 6851
diff changeset
  1375
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1376
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1377
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1378
check_compiler() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1379
	# Params:
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1380
	# $1 - Type for message (build / host)
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1381
	# $2 - What to fill with the found compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1382
	# $3 - System to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1383
	# $4 - Compiler to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1384
	# $5 - Env-setting to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1385
	# $6 - GCC alike to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1386
	# $7 - CC alike to try
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1387
	# $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1388
	# $9 - What the command is to check for
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1389
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1390
	if [ -n "$3" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1391
		# Check for system
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1392
		if [ -z "$6" ]; then
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1393
			compiler="$3"
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1394
		else
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1395
			compiler="$3-$6"
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1396
		fi
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1397
		machine=`eval $compiler $9 2>/dev/null`
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1398
		ret=$?
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1399
		eval "$2=$compiler"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1400
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1401
		log 2 "executing $compiler $9"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1402
		log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1403
		log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1404
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1405
		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5981
1baa6e381f5a (svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents: 5980
diff changeset
  1406
			log 1 "checking $1... $compiler not found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1407
			log 1 "I couldn't detect any $6 binary for $3"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1408
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1409
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1410
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1411
		if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1412
			log 1 "checking $1... expected $3, found $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1413
			log 1 "the compiler suggests it doesn't build code for the machine you specified"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1414
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1415
		fi
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1416
	elif [ -n "$4" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1417
		# Check for manual compiler
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1418
		machine=`$4 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1419
		ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1420
		eval "$2=$4"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1421
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1422
		log 2 "executing $4 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1423
		log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1424
		log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1425
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1426
		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1427
			log 1 "checking $1... $4 not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1428
			log 1 "the selected binary doesn't seem to be a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1429
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1430
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1431
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1432
		# Nothing given, autodetect
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1433
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1434
		if [ -n "$5" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1435
			machine=`$5 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1436
			ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1437
			eval "$2=$5"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1438
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1439
			log 2 "executing $5 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1440
			log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1441
			log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1442
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1443
			# The user defined a GCC that doesn't reply to $9.. abort
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1444
			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1445
				log 1 "checking $1... $5 unusable"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1446
				log 1 "the CC environment variable is set, but it doesn't seem to be a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1447
				log 1 "please redefine the CC/CXX environment to a $6 binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1448
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1449
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1450
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1451
			log 2 "checking $1... CC/CXX not set (skipping)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1452
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1453
			# No $5, so try '$6'
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1454
			machine=`$6 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1455
			ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1456
			eval "$2=$6"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1457
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1458
			log 2 "executing $6 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1459
			log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1460
			log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1461
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1462
			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1463
				# Maybe '$7'?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1464
				machine=`$7 $9 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1465
				ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1466
				eval "$2=$7"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1467
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1468
				log 2 "executing $7 $9"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1469
				log 2 "  returned $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1470
				log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1471
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1472
				# All failed, abort
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1473
				if [ -z "$machine" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1474
					log 1 "checking $1... $6 not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1475
					log 1 "I couldn't detect any $6 binary on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1476
					log 1 "please define the CC/CXX environment to where it is located"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1477
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1478
					exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1479
				fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1480
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1481
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1482
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1483
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1484
	if [ "$8" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1485
		eval "res=\$$2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1486
		log 1 "checking $1... $res"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1487
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1488
		log 1 "checking $1... $machine"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1489
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1490
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1491
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1492
check_build() {
9050
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1493
	if [ "$os" = "FREEBSD" ]; then
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1494
		# FreeBSD's C compiler does not support dump machine.
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1495
		# However, removing C support is not possible because PSP must be linked with the C compiler.
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1496
		check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CXX" "g++" "c++" "0" "-dumpmachine"
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1497
	else
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1498
		check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1499
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1500
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1501
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1502
check_host() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1503
	# By default the host is the build
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1504
	if [ -z "$host" ]; then host="$build"; fi
9050
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1505
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1506
	if [ "$os" = "FREEBSD" ]; then
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1507
		# FreeBSD's C compiler does not support dump machine.
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1508
		# However, removing C support is not possible because PSP must be linked with the C compiler.
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1509
		check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CXX" "g++" "c++" "0" "-dumpmachine"
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1510
	else
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1511
		check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
72e9db1a3b2d (svn r12876) -Fix [FS#1928]: gcc on FreeBSD does not support -dumpmachine. As gcc is not necessary for FreeBSD compiles we 'just' use g++ as that support -dumpmachine.
rubidium
parents: 8782
diff changeset
  1512
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1513
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1514
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1515
check_cxx_build() {
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1516
	check_compiler "build c++" "cxx_build" "$build" "$cxx_build" "$CXX" "g++" "c++" 1 "-dumpmachine"
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1517
}
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1518
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1519
check_cxx_host() {
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1520
	# By default the host is the build
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5578
diff changeset
  1521
	if [ -z "$host" ]; then host="$build"; fi
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1522
	check_compiler "host c++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1523
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1524
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1525
check_windres() {
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1526
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1527
		check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1528
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1529
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1530
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1531
check_strip() {
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1532
	if [ "$os" = "OS2" ]; then
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1533
		# OS2 via gcc is a bit weird.. stripping HAS to be done via emxbind, which is via gcc directly
5980
68b34b5ee4f2 (svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents: 5979
diff changeset
  1534
		echo "checking host strip... using gcc -s option"
5559
dac540e2dbd1 (svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents: 5558
diff changeset
  1535
	elif [ "$os" = "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1536
		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1537
		echo "int main(int argc, char *argv[]) { }" > strip.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1538
		$cc_host strip.test.c -o strip.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1539
		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1540
		rm -f strip.test.c strip.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1541
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1542
		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "-V"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1543
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1544
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1545
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1546
check_lipo() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1547
	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1548
		echo "int main(int argc, char *argv[]) { }" > lipo.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1549
		$cc_host lipo.test.c -o lipo.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1550
		check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1551
		rm -f lipo.test.c lipo.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1552
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1553
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1554
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1555
set_universal_binary_flags() {
9756
acd40bb24510 (svn r13892) -Fix (r13863): [configure] now the SDK selection for OSX sets the default value as intended
bjarni
parents: 9731
diff changeset
  1556
	if [ -z "$osx_target_version" ]; then
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1557
		# if we don't speficy a target version then we presume 10.4
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1558
		osx_target_version=10.4
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1559
	fi
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1560
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1561
	if [ "$osx_target_version" = "10.4" ]; then
9756
acd40bb24510 (svn r13892) -Fix (r13863): [configure] now the SDK selection for OSX sets the default value as intended
bjarni
parents: 9731
diff changeset
  1562
		# Apple added u to 10.4 to show that it's universal
acd40bb24510 (svn r13892) -Fix (r13863): [configure] now the SDK selection for OSX sets the default value as intended
bjarni
parents: 9731
diff changeset
  1563
		# There is a version without the u, but it's only in Xcode 2.0 and people should use the free update to 2.5
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1564
		osx_sysroot_version=10.4u
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1565
	else
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1566
		osx_sysroot_version="$osx_target_version"
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1567
	fi
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1568
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1569
	if [ "$with_osx_sysroot" = "3" ]; then
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1570
		CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1571
		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1572
	fi
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1573
}
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  1574
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1575
check_direct_music() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1576
	echo "
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1577
		#include <windows.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1578
		#include <dmksctrl.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1579
		#include <dmusici.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1580
		#include <dmusicc.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1581
		#include <dmusicf.h>
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1582
		int main(int argc, char *argv[]) { }" > direct_music.test.c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1583
	$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1584
	res=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1585
	rm -f direct_music.test.c direct_music.test
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1586
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1587
	if [ "$res" != "0" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1588
		if [ "$with_direct_music" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1589
			log 1 "configure: error: direct-music is not available on this system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1590
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1591
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1592
		with_direct_music="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1593
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1594
		log 1 "checking direct-music... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1595
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1596
		log 1 "checking direct-music... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1597
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1598
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1599
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1600
check_makedepend() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1601
	if [ "$with_makedepend" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1602
		log 1 "checking makedepend... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1603
		return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1604
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1605
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1606
	if [ "$with_makedepend" = "1" ] || [ "$with_makedepend" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1607
		makedepend="makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1608
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1609
		makedepend="$with_makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1610
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1611
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1612
	rm -f makedepend.tmp
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1613
	touch makedepend.tmp
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1614
	res=`$makedepend -fmakedepend.tmp 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1615
	res=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1616
	log 2 "executing $makedepend -f makedepend.tmp"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1617
	log 2 "  returned `cat makedepend.tmp`"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1618
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1619
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1620
	if [ ! -s makedepend.tmp ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1621
		rm -f makedepend.tmp makedepend.tmp.bak
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1622
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1623
		if [ "$with_makedepend" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1624
			log 1 "checking makedepend... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1625
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1626
			log 1 "I couldn't detect any makedepend on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1627
			log 1 "please locate it via --makedepend=[binary]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1628
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1629
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1630
		elif [ "$with_makedepend" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1631
			log 1 "checking makedepend... $makedepend not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1632
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1633
			log 1 "the selected file doesn't seem to be a valid makedepend binary"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1634
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1635
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1636
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1637
			log 1 "checking makedepend... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1638
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1639
			with_makedepend="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1640
			return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1641
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1642
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1643
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1644
	rm -f makedepend.tmp makedepend.tmp.bak
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1645
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1646
	log 1 "checking makedepend... $makedepend"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1647
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1648
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1649
detect_awk() {
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1650
	# Not all awks allow gsub(), so we test for that here! It is in fact all we need...
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1651
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1652
	# These awks are known to work. Test for them explicit
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1653
	awks="gawk mawk nawk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1654
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1655
	awk_prefix="echo \"a.c b.c c.c\" | tr ' ' \\\\n | "
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1656
	awk_param="' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", \$0); print \$0; }' 2>/dev/null"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1657
	awk_result="a.o b.o c.o "
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1658
	log 2 "Detecing awk..."
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1659
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1660
	log 2 "Trying: $awk_prefix $awk $awk_param"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1661
	res=`eval $awk_prefix $awk $awk_param`
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1662
	log 2 "Result: '$res'"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1663
	if [ "$res" != "$awk_result" ] && [ "$awk" = "awk" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1664
		# User didn't supply his own awk, so try to detect some other known working names for an awk
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1665
		for awk in $awks; do
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1666
			log 2 "Trying: $awk_prefix $awk $awk_param"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1667
			res=`eval $awk_prefix $awk $awk_param`
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1668
			log 2 "Result: '$res'"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1669
			if [ "$res" = "$awk_result" ]; then break; fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1670
		done
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1671
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1672
		if [ "$res" != "$awk_result" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1673
			log 1 "checking awk... not found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1674
			log 1 "configure: error: no awk found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1675
			log 1 "configure: error: please install one of the following: $awks"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1676
			exit 1
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1677
		fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1678
	fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1679
	if [ "$res" != "$awk_result" ]; then
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1680
		log 1 "checking awk... not found"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1681
		log 1 "configure: error: you supplied '$awk' but it doesn't seem a valid gawk or mawk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1682
		exit 1
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1683
	fi
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1684
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1685
	log 1 "checking awk... $awk"
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1686
}
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1687
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1688
detect_os() {
6077
ec7199271f52 (svn r8810) [Configure] -Fix: "" variables if you test them, else if they are empty they return lovely errors (tnx to Celester for finding thisone ;))
truelight
parents: 6046
diff changeset
  1689
	if [ "$os" = "DETECT" ]; then
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1690
		# Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1691
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1692
		# Try first via dumpmachine, then via uname
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1693
		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1694
					/linux/        { print "UNIX";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1695
					/darwin/       { print "OSX";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1696
					/freebsd/      { print "FREEBSD"; exit}
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1697
					/openbsd/      { print "OPENBSD"; exit}
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1698
					/netbsd/       { print "NETBSD";  exit}
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1699
					/hp-ux/        { print "HPUX";    exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1700
					/morphos/      { print "MORPHOS"; exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1701
					/beos/         { print "BEOS";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1702
					/sunos/        { print "SUNOS";   exit}
6220
7694e640e7a2 (svn r9017) [Config] -Fix: if 'solaris' is in gcc dumpmachine, we have SunOS
truelight
parents: 6191
diff changeset
  1703
					/solaris/      { print "SUNOS";   exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1704
					/cygwin/       { print "CYGWIN";  exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1705
					/mingw/        { print "MINGW";   exit}
5539
a77ac9a34e98 (svn r7881) [Configure] -Fix: OS2 GCC indentifies itself with os2, not os/2
truelight
parents: 5538
diff changeset
  1706
					/os2/          { print "OS2";     exit}
5753
553170b2ff57 (svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents: 5587
diff changeset
  1707
					/wince/        { print "WINCE";   exit}
5957
89ca54f5da71 (svn r8628) [PSP] -Add: added configure support for the PlayStation Portable target
truelight
parents: 5941
diff changeset
  1708
					/psp/          { print "PSP";     exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1709
		'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1710
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1711
		if [ -z "$os" ]; then
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  1712
			os=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | $awk '
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1713
					/linux/        { print "UNIX";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1714
					/darwin/       { print "OSX";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1715
					/freebsd/      { print "FREEBSD"; exit}
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1716
					/openbsd/      { print "OPENBSD"; exit}
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1717
					/netbsd/       { print "NETBSD";  exit}
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1718
					/hp-ux/        { print "HPUX";    exit}
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1719
					/morphos/      { print "MORPHOS"; exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1720
					/beos/         { print "BEOS";    exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1721
					/sunos/        { print "SUNOS";   exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1722
					/cygwin/       { print "CYGWIN";  exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1723
					/mingw/        { print "MINGW";   exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1724
					/os\/2/        { print "OS2";     exit}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1725
			'`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1726
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1727
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1728
		if [ -z "$os" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1729
			log 1 "detecting OS... none detected"
6673
edf10cfdee17 (svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents: 6523
diff changeset
  1730
			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  1731
			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1732
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1733
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1734
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1735
		log 1 "detecting OS... $os"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1736
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1737
		log 1 "forcing OS... $os"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1738
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1739
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1740
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1741
detect_sdl() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1742
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1743
	if [ "$with_sdl" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1744
		log 1 "checking SDL... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1745
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1746
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1747
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1748
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1749
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1750
	if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1751
		log 1 "configure: error: it is impossible to compile both SDL and COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1752
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1753
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1754
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1755
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1756
	if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1757
		log 1 "configure: error: it is impossible to compile a dedicated with SDL"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1758
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1759
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1760
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1761
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1762
	if [ "$enable_dedicated" != "0" ]; then
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  1763
		log 1 "checking SDL... dedicated server, skipping"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1764
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1765
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1766
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1767
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1768
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1769
	# By default on OSX we don't use SDL. The rest is auto-detect
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1770
	if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1771
		log 1 "checking SDL... OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1772
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1773
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1774
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1775
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1776
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1777
	if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then
5537
e1b80c739061 (svn r7878) Remove the long gone sdl11-config (again)
tron
parents: 5536
diff changeset
  1778
		sdl_config="sdl-config"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1779
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1780
		sdl_config="$with_sdl"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1781
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1782
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1783
	version=`$sdl_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1784
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1785
	log 2 "executing $sdl_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1786
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1787
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1788
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1789
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1790
		log 1 "checking SDL... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1791
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1792
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1793
		if [ "$with_sdl" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1794
			log 1 "configure: error: sdl-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1795
			log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1796
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1797
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1798
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1799
		sdl_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1800
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1801
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1802
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1803
	log 1 "checking SDL... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1804
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1805
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1806
detect_cocoa() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1807
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1808
	if [ "$with_cocoa" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1809
		log 1 "checking COCOA... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1810
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1811
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1812
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1813
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1814
	if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1815
		log 1 "configure: error: it is impossible to compile a dedicated with COCOA"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1816
		log 1 "configure: error: please deselect one of them and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1817
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1818
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1819
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1820
	if [ "$enable_dedicated" != "0" ]; then
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  1821
		log 1 "checking COCOA... dedicated server, skipping"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1822
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1823
		with_cocoa="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1824
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1825
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1826
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1827
	# By default on OSX we use COCOA. The rest doesn't support it
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1828
	if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1829
		log 1 "checking COCOA... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1830
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1831
		with_cocoa="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1832
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1833
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1834
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1835
	if [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1836
		log 1 "checking COCOA... not OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1837
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1838
		log 1 "configure: error: COCOA video driver is only supported for OSX"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1839
		exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1840
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1841
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1842
	log 1 "checking COCOA... found"
8092
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1843
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1844
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1845
	if [ "$enable_cocoa_quartz" != "0" ]; then
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1846
		log 1 "checking whether to enable the Quartz window subdriver... yes"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1847
	else
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1848
		log 1 "checking whether to enable the Quartz window subdriver... no"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1849
	fi
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1850
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1851
	if [ "$enable_cocoa_quickdraw" != "0" ]; then
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1852
		log 1 "checking whether to enable the Quickdraw window subdriver... yes"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1853
	else
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1854
		log 1 "checking whether to enable the Quickdraw window subdriver... no"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  1855
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1856
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1857
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1858
detect_library() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1859
	# $1 - config-param ($with_zlib value)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1860
	# $2 - library name ('zlib', sets $zlib)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1861
	# $3 - static library name (libz.a)
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1862
	# $4 - header name (zlib.h)
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  1863
	# $5 - force static (if non-empty)
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  1864
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  1865
	if [ -n "$5" ]; then force_static="1"; fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1866
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1867
	# 0 means no, 1 is auto-detect, 2 is force
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1868
	if [ "$1" = "0" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1869
		log 1 "checking $2... disabled"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1870
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1871
		eval "$2=\"\""
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1872
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1873
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1874
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1875
	log 2 "detecting $2"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1876
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1877
	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  1878
		eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1879
		eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1880
		if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1881
			log 2 "  trying /usr/include/$4... no"
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  1882
			eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1883
		fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1884
		eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1885
		if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1886
			log 2 "  trying /usr/local/include/$4... no"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1887
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1888
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1889
		eval "res=\$$2"
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  1890
		if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1891
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1892
			log 2 "  trying $res... found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1893
			# Now find the static lib, if needed
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  1894
			eval "$2=`ls /lib/*.a 2>/dev/null | egrep \"\/$3\$\"`"
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1895
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1896
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1897
				log 2 "  trying /lib/$3... no"
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  1898
				eval "$2=`ls /usr/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1899
			fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1900
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1901
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1902
				log 2 "  trying /usr/lib/$3... no"
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  1903
				eval "$2=`ls /usr/local/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1904
			fi
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1905
			eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1906
			if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1907
				log 2 "  trying /usr/local/lib/$3... no"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1908
				log 1 "configure: error: $2 couldn't be found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1909
				log 1 "configure: error: you requested a static link, but I can't find $3"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1910
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1911
				exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1912
			fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1913
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1914
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1915
		# Make sure it exists
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1916
		if [ -f "$1" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1917
			eval "$2=`ls $1 2>/dev/null`"
5505
fa01ea67ac75 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents: 5503
diff changeset
  1918
		else
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1919
			eval "$2=`ls $1/$3 2>/dev/null`"
5505
fa01ea67ac75 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents: 5503
diff changeset
  1920
		fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1921
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1922
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1923
	eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1924
	if [ -z "$res" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1925
		log 1 "checking $2... not found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1926
		if [ "$1" = "2" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1927
			log 1 "configure: error: $2 couldn't be found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1928
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1929
			exit 1
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1930
		elif [ "$1" != "1" ]; then
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1931
			log 1 "configure: error: $2 couldn't be found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1932
			log 1 "configure: error: you supplied '$1', but it seems invalid"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1933
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1934
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1935
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1936
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1937
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1938
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1939
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1940
	eval "res=\$$2"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1941
	log 2 "  trying $res... found"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1942
6034
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1943
	log 1 "checking $2... found"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1944
}
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1945
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1946
detect_zlib() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1947
	detect_library "$with_zlib" "zlib" "libz.a" "zlib.h"
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1948
}
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1949
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1950
detect_libtimidity() {
7a125490f55c (svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents: 5981
diff changeset
  1951
	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1952
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1953
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1954
detect_png() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1955
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1956
	if [ "$with_png" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1957
		log 1 "checking libpng... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1958
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1959
		png_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1960
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1961
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1962
10265
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1963
	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1964
		if [ "$with_png" != "1" ]; then
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1965
			log 1 "checking libpng... no zlib"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1966
			log 1 "ERROR: libpng was forced, but zlib was not detected / disabled."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1967
			log 1 "ERROR: libpng depends on zlib."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1968
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1969
			exit 1
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1970
		fi
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1971
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1972
		log 1 "checking libpng... no zlib, skipping"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1973
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1974
		png_config=""
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  1975
		return 0
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1976
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1977
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1978
	if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1979
		png_config="libpng-config"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1980
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1981
		png_config="$with_png"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1982
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1983
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1984
	version=`$png_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1985
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1986
	log 2 "executing $png_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1987
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1988
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1989
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1990
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1991
		log 1 "checking libpng... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1992
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1993
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  1994
		if [ "$with_png" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1995
			log 1 "configure: error: libpng-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1996
			log 1 "configure: error: you supplied '$with_png', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1997
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1998
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  1999
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2000
		png_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2001
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2002
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2003
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2004
	log 1 "checking libpng... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2005
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2006
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2007
detect_freetype() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2008
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2009
	if [ "$with_freetype" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2010
		log 1 "checking libfreetype... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2011
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2012
		freetype_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2013
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2014
	fi
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2015
	if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2016
		log 1 "checking libfreetype... dedicated server, skipping"
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2017
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2018
		freetype_config=""
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2019
		return 0
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2020
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2021
10265
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2022
	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2023
		if [ "$with_freetype" != "1" ]; then
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2024
			log 1 "checking libfreetype... no zlib"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2025
			log 1 "ERROR: libfreetype was forced, but zlib was not detected / disabled."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2026
			log 1 "ERROR: libfreetype depends on zlib."
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2027
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2028
			exit 1
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2029
		fi
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2030
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2031
		log 1 "checking libfreetype... no zlib, skipping"
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2032
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2033
		freetype_config=""
625e98387a07 (svn r14496) -Fix: give a clear warning when people disable zlib (or when it wasn't detected), but keep on going nevertheless (on request by Rubidium)
truebrain
parents: 10264
diff changeset
  2034
		return 0
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2035
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2036
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2037
	if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2038
		freetype_config="freetype-config"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2039
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2040
		freetype_config="$with_freetype"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2041
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2042
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2043
	version=`$freetype_config --version 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2044
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2045
	log 2 "executing freetype_config --version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2046
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2047
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2048
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2049
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2050
		log 1 "checking libfreetype... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2051
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2052
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2053
		if [ "$with_freetype" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2054
			log 1 "configure: error: freetype-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2055
			log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2056
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2057
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2058
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2059
		freetype_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2060
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2061
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2062
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2063
	log 1 "checking libfreetype... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2064
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2065
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2066
detect_fontconfig() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2067
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2068
	if [ "$with_fontconfig" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2069
		log 1 "checking libfontconfig... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2070
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2071
		fontconfig_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2072
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2073
	fi
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2074
	if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2075
		log 1 "checking libfontconfig... dedicated server, skipping"
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2076
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2077
		fontconfig_config=""
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2078
		return 0
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2079
	fi
10266
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2080
	if [ "$with_fontconfig" != "2" ] && [ -z "$freetype_config" ]; then
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2081
		log 1 "checking libfontconfig... no freetype, skipping"
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2082
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2083
		fontconfig_config=""
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2084
		return 0
21572e285f06 (svn r14497) -Fix: if freetype was not detected or disabled, skip fontconfig detection, unless explicit requested (on request by Rubidium)
truebrain
parents: 10265
diff changeset
  2085
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2086
6249
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2087
	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2088
		log 1 "checking libfontconfig... WIN32, skipping"
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2089
		fontconfig_config=""
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2090
		return 0
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2091
	fi
e3e0d224edf9 (svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents: 6246
diff changeset
  2092
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2093
	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2094
		fontconfig_config="pkg-config fontconfig"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2095
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2096
		fontconfig_config="$with_fontconfig"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2097
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2098
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2099
	version=`$fontconfig_config --modversion 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2100
	ret=$?
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2101
	shortversion=`echo $version | cut -c 1,3`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2102
	log 2 "executing $fontconfig_config --modversion"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2103
	log 2 "  returned $version"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2104
	log 2 "  exit code $ret"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2105
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2106
	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2107
		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2108
			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2109
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2110
			log 1 "checking libfontconfig... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2111
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2112
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2113
		# It was forced, so it should be found.
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2114
		if [ "$with_fontconfig" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2115
			log 1 "configure: error: fontconfig-config couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2116
			log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2117
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2118
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2119
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2120
		fontconfig_config=""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2121
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2122
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2123
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2124
	log 1 "checking libfontconfig... found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2125
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2126
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2127
detect_icu() {
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2128
	# 0 means no, 1 is auto-detect, 2 is force
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2129
	if [ "$with_icu" = "0" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2130
		log 1 "checking libicu... disabled"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2131
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2132
		icu_config=""
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2133
		return 0
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2134
	fi
10264
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2135
	if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2136
		log 1 "checking libicu... dedicated server, skipping"
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2137
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2138
		icu_config=""
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2139
		return 0
308d95eddae9 (svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
truebrain
parents: 10249
diff changeset
  2140
	fi
10248
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2141
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2142
	if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2143
		icu_config="icu-config"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2144
	else
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2145
		icu_config="$with_icu"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2146
	fi
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2147
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2148
	version=`$icu_config --version 2>/dev/null`
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2149
	ret=$?
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2150
	shortversion=`echo $version | cut -c 1,3`
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2151
	log 2 "executing $icu_config --version"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2152
	log 2 "  returned $version"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2153
	log 2 "  exit code $ret"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2154
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2155
	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "20" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2156
		if [ -n "$shortversion" ] && [ "$shortversion" -lt "20" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2157
			log 1 "checking libicu... needs at least version 2.0.0, icu NOT enabled"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2158
		else
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2159
			log 1 "checking libicu... not found"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2160
		fi
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2161
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2162
		# It was forced, so it should be found.
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2163
		if [ "$with_icu" != "1" ]; then
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2164
			log 1 "configure: error: icu-config couldn't be found"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2165
			log 1 "configure: error: you supplied '$with_icuconfig', but it seems invalid"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2166
			exit 1
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2167
		fi
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2168
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2169
		icu_config=""
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2170
		return 0
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2171
	fi
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2172
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2173
	log 1 "checking libicu... found"
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2174
}
f0297aac2ff2 (svn r14479) -Add: initial (optional) support for handling bidirectional scripts and connecting Arabic characters.
rubidium
parents: 10246
diff changeset
  2175
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2176
detect_pspconfig() {
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2177
	# 0 means no, 1 is auto-detect, 2 is force
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2178
	if [ "$with_psp_config" = "0" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2179
		log 1 "checking psp-config... disabled"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2180
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2181
		psp_config=""
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2182
		return 0
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2183
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2184
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2185
	if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2186
		log 1 "checking psp-config... not PSP, skipping"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2187
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2188
		psp_config="";
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2189
		return 0
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2190
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2191
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2192
	if [ "$os" != "PSP" ]; then
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2193
		log 1 "checking psp-config... not PSP"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2194
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2195
		log 1 "configure: error: psp-config is only supported for PSP"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2196
		exit 1
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2197
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2198
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2199
	if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2200
		psp_config="psp-config"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2201
	else
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2202
		psp_config="$with_psp_config"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2203
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2204
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2205
	version=`$psp_config -p 2>/dev/null`
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2206
	ret=$?
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2207
	log 2 "executing $psp_config -p"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2208
	log 2 "  returned $version"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2209
	log 2 "  exit code $ret"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2210
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2211
	if [ -z "$version" ] || [ "$ret" != "0" ]; then
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2212
		log 1 "checking psp-config... not found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2213
		log 1 "configure: error: psp-config couldn't be found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2214
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2215
		# It was forced, so it should be found.
5961
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2216
		if [ "$with_psp_config" != "1" ]; then
5c300d5b3aa9 (svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents: 5960
diff changeset
  2217
			log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2218
		fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2219
		exit 1
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2220
	fi
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2221
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2222
	log 1 "checking psp-config... found"
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2223
}
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2224
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2225
detect_iconv() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2226
	# 0 means no, 1 is auto-detect, 2 is force
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2227
	if [ "$with_iconv" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2228
		log 1 "checking iconv... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2229
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2230
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2231
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2232
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2233
	if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2234
		log 1 "checking iconv... not OSX, skipping"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2235
		with_iconv="0"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2236
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2237
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2238
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2239
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2240
	# Try to find iconv.h, seems to only thing to detect iconv with
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2241
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2242
	if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2243
		iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"`
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2244
		if [ -z "$iconv" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2245
			iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2246
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2247
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2248
		# Make sure it exists
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2249
		iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2250
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2251
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2252
	if [ -z "$iconv" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2253
		log 1 "checking iconv... not found"
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2254
		if [ "$with_iconv" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2255
			log 1 "configure: error: iconv couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2256
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2257
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2258
		elif [ "$with_iconv" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2259
			log 1 "configure: error: iconv couldn't be found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2260
			log 1 "configure: error: you supplied '$with_iconv', but I couldn't detect iconv in it"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2261
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2262
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2263
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2264
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2265
		return 0
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2266
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2267
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2268
	if [ "$with_iconv" = "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2269
		with_iconv="2"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2270
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2271
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2272
	log 2 "found iconv in $iconv"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2273
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2274
	log 1 "checking iconv... found"
7839
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2275
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2276
	# Check if we need to work around buggy iconv implementation where inbuf
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2277
	# is wrongly typed as non-const. Correct implementation is at
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2278
	# http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2279
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2280
	cat > tmp.iconv.cpp << EOF
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2281
#include "src/stdafx.h"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2282
#include <iconv.h>
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2283
int main() {
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2284
	static char buf[1024];
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2285
	iconv_t convd = 0;
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2286
	const char *inbuf = "";
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2287
	char *outbuf  = buf;
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2288
	size_t outlen = 1023;
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2289
	size_t inlen  = 0;
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2290
	return iconv(convd, &inbuf, &inlen, &outbuf, &outlen);
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2291
}
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2292
EOF
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2293
	execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2294
	eval $execute >&/dev/null
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2295
	ret=$?
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2296
	log 2 "executing $execute"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2297
	log 2 "  exit code $ret"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2298
	if [ "$ret" = "0" ]; then have_broken_iconv="no"; else have_broken_iconv="yes"; fi
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2299
	log 1 "checking if iconv has non-const inbuf... $have_broken_iconv"
feb131e32620 (svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents: 7774
diff changeset
  2300
	rm -f tmp.iconv tmp.iconv.cpp
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2301
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2302
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2303
_detect_sort() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2304
	sort_test_in="d
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2305
a
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2306
c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2307
b"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2308
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2309
	sort_test_out="a
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2310
b
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2311
c
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2312
d"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2313
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2314
	log 2 "running echo <array> | $1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2315
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2316
	if [ "`echo \"$sort_test_in\" | $1 2>/dev/null`" = "$sort_test_out" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2317
		sort="$1"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2318
		log 2 "  result was valid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2319
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2320
		log 2 "  result was invalid"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2321
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2322
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2323
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2324
detect_sort() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2325
	if [ "$with_sort" = "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2326
		log 1 "checking sort... disabled"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2327
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2328
		return
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2329
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2330
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2331
	if [ "$with_sort" = "1" ] || [ "$with_sort" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2332
		_detect_sort "sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2333
		if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2334
		if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2335
		if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2336
		if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2337
		if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2338
		if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2339
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2340
		_detect_sort "$with_sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2341
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2342
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2343
	if [ -z "$sort" ]; then
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2344
		if [ "$with_sort" = "2" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2345
			log 1 "checking sort... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2346
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2347
			log 1 "configure: error: couldn't detect sort on your system"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2348
			exit 1
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2349
		elif [ "$with_sort" != "1" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2350
			log 1 "checking sort... $with_sort not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2351
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2352
			log 1 "configure: error: '$with_sort' doesn't look like a sort to me"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2353
			log 1 "configure: error: please verify its location and function and try again"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2354
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2355
			exit 1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2356
		else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2357
			log 1 "checking sort... not found"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2358
		fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2359
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2360
		log 1 "checking sort... $sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2361
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2362
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2363
6938
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2364
detect_cputype() {
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2365
	if [ -n "$cpu_type" ] && [ "$cpu_type" != "DETECT" ]; then
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2366
		log 1 "forcing cpu-type... $cpu_type bits"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2367
		return;
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2368
	fi
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2369
	echo "#include \"src/stdafx.h\"" > tmp.64bit.cpp
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2370
	echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2371
	echo "int main() { return 0; }" >> tmp.64bit.cpp
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2372
	execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2373
	cpu_type="`eval $execute 2>/dev/null`"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2374
	ret=$?
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2375
	log 2 "executing $execute"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2376
	log 2 "  returned $cpu_type"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2377
	log 2 "  exit code $ret"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2378
	if [ "$ret" = "0" ]; then cpu_type="64"; else cpu_type="32"; fi
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2379
	log 1 "detecting cpu-type... $cpu_type bits"
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2380
	rm -f tmp.64bit tmp.64bit.cpp
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2381
}
ee22ce416ed1 (svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents: 6930
diff changeset
  2382
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2383
make_sed() {
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  2384
	T_CFLAGS="$CFLAGS"
9731
4332cbaf5bd4 (svn r13863) -Fix (r13852): make the nightly compile again
smatz
parents: 9727
diff changeset
  2385
	T_LDFLAGS="$LDFLAGS"
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  2386
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2387
	# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2388
	#  We do this here, and not sooner, so universal builds also have this
5541
f034f6f60d88 (svn r7883) It's spelled 'automatically'
tron
parents: 5539
diff changeset
  2389
	#  automatically correct
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2390
	# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2391
	#  we use 1 byte per bool normally in C part. So convert that last one to 4
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2392
	#  bytes too, but only for PPC.
6980
c7c4f3bf5901 (svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents: 6938
diff changeset
  2393
	ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"`
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2394
	if [ -n "$ppc" ]; then
9727
3c06f03dadbe (svn r13852) -Fix (r13849): [OSX] fixed universal binary building without breaking anything this time
bjarni
parents: 9724
diff changeset
  2395
		T_CFLAGS="$T_CFLAGS -DFOUR_BYTE_BOOL"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2396
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2397
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2398
	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2399
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2400
	# All the data needed to compile a single target
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2401
	#  Make sure if you compile multiple targets to
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2402
	#  use multiple OBJS_DIR, because all in-between
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2403
	#  binaries are stored in there, and nowhere else.
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2404
	SRC_REPLACE="
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2405
		s~!!CC_HOST!!~$cc_host~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2406
		s~!!CXX_HOST!!~$cxx_host~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2407
		s~!!CC_BUILD!!~$cc_build~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2408
		s~!!CXX_BUILD!!~$cxx_build~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2409
		s~!!WINDRES!!~$windres~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2410
		s~!!STRIP!!~$strip $strip_arg~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2411
		s~!!LIPO!!~$lipo~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2412
		s~!!CC_CFLAGS!!~$CC_CFLAGS~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2413
		s~!!CFLAGS!!~$T_CFLAGS~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2414
		s~!!CFLAGS_BUILD!!~$CFLAGS_BUILD~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2415
		s~!!STRGEN_FLAGS!!~$strgen_flags~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2416
		s~!!LIBS!!~$LIBS~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2417
		s~!!LDFLAGS!!~$T_LDFLAGS~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2418
		s~!!BIN_DIR!!~$BIN_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2419
		s~!!ROOT_DIR!!~$ROOT_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2420
		s~!!MEDIA_DIR!!~$MEDIA_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2421
		s~!!SOURCE_LIST!!~$SOURCE_LIST~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2422
		s~!!SRC_OBJS_DIR!!~$SRC_OBJS_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2423
		s~!!LANG_OBJS_DIR!!~$LANG_OBJS_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2424
		s~!!SRC_DIR!!~$SRC_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2425
		s~!!OSXAPP!!~$OSXAPP~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2426
		s~!!LANG_DIR!!~$LANG_DIR~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2427
		s~!!TTD!!~$TTD~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2428
		s~!!BINARY_DIR!!~$prefix_dir/$binary_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2429
		s~!!DATA_DIR!!~$prefix_dir/$data_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2430
		s~!!DOC_DIR!!~$prefix_dir/$doc_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2431
		s~!!MAN_DIR!!~$prefix_dir/$man_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2432
		s~!!ICON_DIR!!~$prefix_dir/$icon_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2433
		s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2434
		s~!!PERSONAL_DIR!!~$personal_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2435
		s~!!SHARED_DIR!!~$shared_dir~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2436
		s~!!INSTALL_DIR!!~$install_dir~g;
10244
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
  2437
		s~!!BINARY_NAME!!~$binary_name~g;
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2438
		s~!!STRGEN!!~$STRGEN~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2439
		s~!!ENDIAN_CHECK!!~$ENDIAN_CHECK~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2440
		s~!!ENDIAN_FORCE!!~$endian~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2441
		s~!!STAGE!!~$STAGE~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2442
		s~!!MAKEDEPEND!!~$makedepend~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2443
		s~!!CFLAGS_MAKEDEP!!~$cflags_makedep~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2444
		s~!!SORT!!~$sort~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2445
		s~!!CONFIG_CACHE_COMPILER!!~config.cache.compiler~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2446
		s~!!CONFIG_CACHE_LINKER!!~config.cache.linker~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2447
		s~!!CONFIG_CACHE_ENDIAN!!~config.cache.endian~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2448
		s~!!CONFIG_CACHE_SOURCE!!~config.cache.source~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2449
		s~!!CONFIG_CACHE_VERSION!!~config.cache.version~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2450
		s~!!CONFIG_CACHE_SOURCE_LIST!!~config.cache.source.list~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2451
		s~!!CONFIG_CACHE_PWD!!~config.cache.pwd~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2452
		s~!!LANG_SUPPRESS!!~$lang_suppress~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2453
		s~!!OBJS_C!!~$OBJS_C~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2454
		s~!!OBJS_CPP!!~$OBJS_CPP~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2455
		s~!!OBJS_MM!!~$OBJS_MM~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2456
		s~!!OBJS_RC!!~$OBJS_RC~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2457
		s~!!SRCS!!~$SRCS~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2458
		s~!!OS!!~$os~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2459
		s~!!CONFIGURE_FILES!!~$CONFIGURE_FILES~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2460
		s~!!REVISION!!~$revision~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2461
		s~!!AWK!!~$awk~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2462
		s~!!GCC295!!~$gcc295~g;
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2463
		s~!!DISTCC!!~$distcc~g;
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2464
	"
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2465
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2466
	if [ "$icon_theme_dir" != "" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2467
		SRC_REPLACE="$SRC_REPLACE
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2468
			s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2469
		"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2470
	else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2471
		SRC_REPLACE="$SRC_REPLACE
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2472
			s#!!ICON_THEME_DIR!!##g;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2473
		"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2474
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2475
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2476
	if [ "$man_dir" != "" ]; then
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2477
		SRC_REPLACE="$SRC_REPLACE
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2478
			s#!!MAN_DIR!!#$prefix_dir/$man_dir#g;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2479
		"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2480
	else
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2481
		SRC_REPLACE="$SRC_REPLACE
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2482
			s#!!MAN_DIR!!##g;
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2483
		"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2484
	fi
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2485
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2486
	if [ "$menu_dir" != "" ]; then
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2487
		SRC_REPLACE="$SRC_REPLACE
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2488
			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2489
		"
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2490
	else
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2491
		SRC_REPLACE="$SRC_REPLACE
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2492
			s#!!MENU_DIR!!##g;
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2493
		"
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2494
	fi
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2495
}
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2496
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2497
generate_menu_item() {
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2498
	MENU_REPLACE="
10239
cf55a4c21e7f (svn r14467) -Fix [FS#2350](r14443): use '~' instead of '#' as sed separator, it could be understood in a wrong way by shell
smatz
parents: 10220
diff changeset
  2499
		s~!!TTD!!~$TTD~g;
10245
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
  2500
		s~!!MENU_GROUP!!~$menu_group~g;
f7274a7079d6 (svn r14475) -Add: allow setting the name of the desktop item (follow-up on r14474)
truebrain
parents: 10244
diff changeset
  2501
		s~!!MENU_NAME!!~$menu_name~g
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2502
	"
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2503
	echo "Generating menu item..."
10058
83345e93c7fb (svn r14225) -Fix [configure]: make sure a dir exists if you want to write into it
truebrain
parents: 10057
diff changeset
  2504
	mkdir -p media
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2505
	< $ROOT_DIR/media/openttd.desktop.in sed "$MENU_REPLACE" > media/openttd.desktop
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2506
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2507
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2508
generate_main() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2509
	STAGE="[MAIN]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2510
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2511
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2512
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2513
	# Create the main Makefile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2514
	echo "Generating Makefile..."
10076
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2515
	echo "# Auto-generated file from 'Makefile.in' -- DO NOT EDIT" > Makefile
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2516
	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" >> Makefile
10057
a6dea11e197d (svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD
truebrain
parents: 10024
diff changeset
  2517
	cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2518
	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
5556
2c1fdf0bc6a4 (svn r7940) Add an empty line instead of overwriting the just written file
tron
parents: 5555
diff changeset
  2519
	echo >> Makefile.am
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2520
	# Make the copy of the source-list, so we don't trigger an unwanted recompile
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2521
	cp $SOURCE_LIST config.cache.source.list
10060
e4d56b76c100 (svn r14227) -Fix [configure]: detect if we are in a new directory, and rerun configure in those cases. Should avoid confusion (idea by Eddi)
truebrain
parents: 10059
diff changeset
  2522
	# Add the current directory, so we don't trigger an unwanted recompile
e4d56b76c100 (svn r14227) -Fix [configure]: detect if we are in a new directory, and rerun configure in those cases. Should avoid confusion (idea by Eddi)
truebrain
parents: 10059
diff changeset
  2523
	echo "`pwd`" > config.cache.pwd
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2524
	# Make sure config.cache is OLDER then config.cache.source.list
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2525
	touch config.cache
10060
e4d56b76c100 (svn r14227) -Fix [configure]: detect if we are in a new directory, and rerun configure in those cases. Should avoid confusion (idea by Eddi)
truebrain
parents: 10059
diff changeset
  2526
	touch config.pwd
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2527
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2528
	if [ "$menu_dir" != "" ]; then
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2529
		generate_menu_item
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2530
	fi
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2531
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2532
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2533
generate_lang() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2534
	STAGE="[LANG]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2535
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2536
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2537
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2538
	# Create the language file
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2539
	mkdir -p $LANG_OBJS_DIR
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2540
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2541
	echo "Generating lang/Makefile..."
10076
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2542
	echo "# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT" > $LANG_OBJS_DIR/Makefile
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2543
	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" >> $LANG_OBJS_DIR/Makefile
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2544
	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2545
	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2546
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2547
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2548
generate_src_normal() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2549
	STAGE=$1
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2550
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2551
	make_sed
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2552
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2553
	# Create the source file
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2554
	mkdir -p $SRC_OBJS_DIR
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2555
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2556
	echo "Generating $2/Makefile..."
10076
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2557
	echo "# Auto-generated file from 'Makefile.src.in' -- DO NOT EDIT" > $SRC_OBJS_DIR/Makefile
bdf576e96502 (svn r14244) -Fix: add 'Auto-generated' text when autogenerated, not in template (complain by blathijs ;))
truebrain
parents: 10060
diff changeset
  2558
	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" >> $SRC_OBJS_DIR/Makefile
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2559
	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2560
	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2561
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2562
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2563
generate_src_osx() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2564
	cc_host_orig="$cc_host"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2565
	cxx_host_orig="$cxx_host"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2566
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2567
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2568
	cc_host="$cc_host_orig -arch ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2569
	cxx_host="$cxx_host_orig -arch ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2570
	generate_src_normal "[PowerPC]" "objs/ppc"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2571
5493
3796771bb24b (svn r7777) [Configure] -Fix: call intel builds on OSX universal compiles intel, not i386 (that is just silly)
truelight
parents: 5491
diff changeset
  2572
	BASE_SRC_OBJS_DIR="$OBJS_DIR/intel"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2573
	cc_host="$cc_host_orig -arch i386"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2574
	cxx_host="$cxx_host_orig -arch i386"
5494
2b201653bf19 (svn r7778) -Fix (r7777): intel -> Intel
truelight
parents: 5493
diff changeset
  2575
	generate_src_normal "[Intel]" "objs/intel"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2576
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2577
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2578
	cc_host="$cc_host_orig -arch ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2579
	cxx_host="$cxx_host_orig -arch ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2580
	CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2581
	generate_src_normal "[PowerPC G5]" "objs/ppc970"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2582
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2583
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2584
generate_src() {
5558
4bceae3ff866 (svn r7942) Trim another 192 lines from the configure monster
tron
parents: 5557
diff changeset
  2585
	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2586
		generate_src_osx
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2587
	else
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2588
		generate_src_normal "[SRC]" "objs"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2589
	fi
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2590
}
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2591
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2592
showhelp() {
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2593
	echo "'configure' configures OpenTTD."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2594
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2595
	echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2596
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2597
	echo "To assign environment variables (e.g., CC, CFLAGS...), specify them as"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2598
	echo "VAR=VALUE.  See below for descriptions of some of the useful variables."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2599
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2600
	echo "Defaults for the options are specified in brackets."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2601
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2602
	echo "Configuration:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2603
	echo "  -h, --help                     display this help and exit"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2604
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2605
	echo "System types:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2606
	echo "  --build=BUILD                  configure for building on BUILD [guessed]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2607
	echo "  --host=HOST                    cross-compile to build programs to run"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2608
	echo "                                 on HOST [BUILD]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2609
	echo "  --windres=WINDRES              the windres to use [HOST-windres]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2610
	echo "  --strip=STRIP                  the strip to use [HOST-strip]"
6081
57d2fa5e3073 (svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents: 6080
diff changeset
  2611
	echo "  --awk=AWK                      the awk to use in configure [awk]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2612
	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2613
	echo "  --os=OS                        the OS we are compiling for [DETECT]"
9072
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  2614
	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  2615
	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
c4126d1e01cf (svn r12930) -Add: build support for NetBSD and HP-UX. Patch by ahoka.
rubidium
parents: 9050
diff changeset
  2616
	echo "                                 WINCE/PSP"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2617
	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2618
	echo "  --revision=rXXXX               overwrite the revision detection."
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2619
	echo "                                 Use with care!"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2620
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2621
	echo "Paths:"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2622
	echo "  --prefix-dir=dir               specifies the prefix for all installed"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2623
	echo "                                 files [/usr/local]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2624
	echo "  --binary-dir=dir               location of the binary. Will be prefixed"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2625
	echo "                                 with the prefix-dir [games]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2626
	echo "  --data-dir=dir                 location of data files (lang, data, gm)."
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2627
	echo "                                 Will be prefixed with the prefix-dir"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2628
	echo "                                 [share/games/openttd]"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2629
	echo "  --doc-dir=dir                  location of the doc files"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2630
	echo "                                 Will be prefixed with the prefix-dir"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2631
	echo "                                 [$doc_dir]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2632
	echo "  --icon-dir=dir                 location of icons. Will be prefixed"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2633
	echo "                                 with the prefix-dir [share/pixmaps]"
9694
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2634
	echo "  --icon-theme-dir=dir           location of icon theme."
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2635
	echo "                                 Will be prefixed with the prefix-dir"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2636
	echo "                                 and postfixed with size-dirs [$icon_theme_dir]"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2637
	echo "  --man-dir=dir                  location of the manual page (UNIX only)"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2638
	echo "                                 Will be prefixed with the prefix-dir"
dd079aa41896 (svn r13801) -Add: further configuration options to make packaging more union
skidd13
parents: 9687
diff changeset
  2639
	echo "                                 [$man_dir]"
9680
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2640
	echo "  --menu-dir=dir                 location of the menu item. (UNIX only, except OSX)"
91e74d1291fd (svn r13785) -Add: support for freedesktop.org desktop entry files
skidd13
parents: 9577
diff changeset
  2641
	echo "                                 Will be prefixed with the prefix-dir"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2642
	echo "                                 [share/applications]"
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  2643
	echo "  --personal-dir=dir             location of the personal directory"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2644
	echo "                                 [os-dependent default]"
8273
1d95cbda404b (svn r11837) -Feature: [OSX] added "/Library/Application Support/OpenTTD" to the search paths (based on patch by pv2b)
bjarni
parents: 8269
diff changeset
  2645
	echo "  --shared-dir=dir               location of shared data files"
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2646
	echo "                                 [os-dependent default]"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2647
	echo "  --install-dir=dir              specifies the root to install to."
10059
7a8d30d55bdc (svn r14226) -Revert r13792: 'configure --help' failed when for example gcc wasn't detected .. not really what you expect. By the lack of imagination, a revert will have to do for now.
truebrain
parents: 10058
diff changeset
  2648
	echo "                                 Useful to install into jails [/]"
10244
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
  2649
	echo "  --binary-name                  the name used for the binary, icons,"
b0fd746c5532 (svn r14474) -Add: allow --binary-name to set the name of the binary, icon, desktop file, etc. when installing. Useful to get a stable next to a trunk-nightly
truebrain
parents: 10239
diff changeset
  2650
	echo "                                 desktop file, etc. when installing [openttd]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2651
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2652
	echo "Features and packages:"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2653
	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"
9924
329dcdbf283a (svn r14079) -Fix: misleading help in configure
glx
parents: 9756
diff changeset
  2654
	echo "  --enable-desync-debug=[LVL]    enable desync debug options (LVL=[012], 0 is none"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2655
	echo "  --enable-profiling             enables profiling"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2656
	echo "  --enable-dedicated             compile a dedicated server (without video)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2657
	echo "  --enable-static                enable static compile (doesn't work for"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2658
	echo "                                 all HOSTs)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2659
	echo "  --enable-translator            enable extra output for translators"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2660
	echo "  --enable-universal             enable universal builds (OSX ONLY)"
10024
2e00ada672d1 (svn r14183) -Fix: "optimalization" is not a word
peter1138
parents: 9933
diff changeset
  2661
	echo "  --enable-osx-g5                enables optimizations for G5 (OSX ONLY)"
8092
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  2662
	echo "  --disable-cocoa-quartz         disable the quartz window mode driver for Cocoa (OSX ONLY)"
233af5e53af9 (svn r11653) -Feature: [OSX] Allow windowed mode subdrivers to be disabled at compile time.
egladil
parents: 8080
diff changeset
  2663
	echo "  --disable-cocoa-quickdraw      disable the quickdraw window mode driver for Cocoa (OSX ONLY)"
7687
18f5be95ad53 (svn r11218) -Codechange: remove unused ENABLE_INSTALL in Makefile.in, and add --disable-unicode in configure help
glx
parents: 7618
diff changeset
  2664
	echo "  --disable-unicode              disable unicode support to build win9x"
18f5be95ad53 (svn r11218) -Codechange: remove unused ENABLE_INSTALL in Makefile.in, and add --disable-unicode in configure help
glx
parents: 7618
diff changeset
  2665
	echo "                                 version (Win32 ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2666
	echo "  --disable-network              disable network support"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2667
	echo "  --disable-assert               disable asserts (continue on errors)"
8782
966391d8d879 (svn r12483) -Change: disable stripping of binaries by default so we have a (much) better chance of actually getting something useful out of OSX stacktraces.
rubidium
parents: 8695
diff changeset
  2668
	echo "  --enable-strip                 enable any possible stripping"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2669
	echo "  --without-osx-sysroot          disable the automatic adding of sysroot "
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2670
	echo "                                 (OSX ONLY)"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2671
	echo "  --without-application-bundle   disable generation of application bundle"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2672
	echo "                                 (OSX ONLY)"
9684
b2f4a70edaaa (svn r13790) -Fix: Enable to force the creation of freedesktop.org desktop entry files
skidd13
parents: 9681
diff changeset
  2673
	echo "  --without-menu-entry           Don't generate a menu item (Freedesktop based only)"
9924
329dcdbf283a (svn r14079) -Fix: misleading help in configure
glx
parents: 9756
diff changeset
  2674
	echo "  --menu-group=group             Category in which the menu item will be placed (Freedesktop based only)"
10246
d1227bb654b8 (svn r14476) -Fix r14475: (no comment)
truebrain
parents: 10245
diff changeset
  2675
	echo "  --menu-name=name               Name of the menu item when placed [OpenTTD]"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2676
	echo "  --with-direct-music            enable direct music support (Win32 ONLY)"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2677
	echo "  --with-sort=sort               define a non-default location for sort"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2678
	echo "  --with-midi=midi               define which midi-player to use"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2679
	echo "  --with-midi-arg=arg            define which args to use for the"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2680
	echo "                                 midi-player"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2681
	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2682
	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2683
	echo "  --with-zlib[=zlib.a]           enables zlib support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2684
	echo "  --with-png[=libpng-config]     enables libpng support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2685
	echo "  --with-freetype[=freetype-config]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2686
	echo "                                 enables libfreetype support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2687
	echo "  --with-fontconfig[=pkg-config fontconfig]"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2688
	echo "                                 enables fontconfig support"
10249
77b68778b102 (svn r14480) -Add: warning when trying to use a right-to-left language without support for it in OpenTTD.
rubidium
parents: 10248
diff changeset
  2689
	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2690
	echo "  --with-iconv[=iconv-path]      enables iconv support"
5958
b8c4b6a82941 (svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents: 5957
diff changeset
  2691
	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2692
	echo "  --with-makedepend[=makedepend] enables makedepend support"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2693
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2694
	echo "Some influential environment variables:"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2695
	echo "  CC                             C compiler command"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2696
	echo "  CXX                            C++ compiler command"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2697
	echo "  CFLAGS                         C compiler flags"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2698
	echo "  WINDRES                        windres command"
5491
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2699
	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2700
	echo "                                 have libraries in a nonstandard"
87f8b5a8cfb5 (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents: 5485
diff changeset
  2701
	echo "                                 directory <lib dir>"
5475
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2702
	echo ""
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2703
	echo "Use these variables to override the choices made by 'configure' or to help"
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2704
	echo "it to find libraries and programs with nonstandard names/locations."
2e6990a8c7c4 (svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff changeset
  2705
}