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