diff options
| author | truelight <truelight@openttd.org> | 2007-02-08 12:54:23 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-02-08 12:54:23 +0000 |
| commit | 54b07056f91cb111eafd3765d21dfede66de6e4f (patch) | |
| tree | 640d122088380458e0818423df6d7dc73e1b311c | |
| parent | a07cb5ad9775267dcd4af93abb0273ab1b0d713e (diff) | |
| download | openttd-54b07056f91cb111eafd3765d21dfede66de6e4f.tar.xz | |
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
| -rw-r--r-- | config.lib | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/config.lib b/config.lib index 72bb452e6..63bc9f04b 100644 --- a/config.lib +++ b/config.lib @@ -54,9 +54,9 @@ set_default() { with_midi_arg="" with_freetype="1" with_fontconfig="1" - with_pspconfig="1" + with_psp_config="1" - save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip 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 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_freetype with_fontconfig with_pspconfig CC CXX CFLAGS LDFLAGS" + save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip 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 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_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS" } detect_params() { @@ -198,9 +198,9 @@ detect_params() { --without-libfontconfig) with_fontconfig="0";; --with-libfontconfig=*) with_fontconfig="$optarg";; - --with-psp-config) with_pspconfig="2";; - --without-psp-config) with_pspconfig="0";; - --with-psp-config=*) with_pspconfig="$optarg";; + --with-psp-config) with_psp_config="2";; + --without-psp-config) with_psp_config="0";; + --with-psp-config=*) with_psp_config="$optarg";; --with-makedepend) with_makedepend="2";; --without-makedepend) with_makedepend="0";; @@ -1466,14 +1466,14 @@ detect_fontconfig() { detect_pspconfig() { # 0 means no, 1 is auto-detect, 2 is force - if [ "$with_pspconfig" = "0" ]; then + if [ "$with_psp_config" = "0" ]; then log 1 "checking psp-config... disabled" psp_config="" return 0 fi - if [ "$with_pspconfig" = "1" ] && [ "$os" != "PSP" ]; then + if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then log 1 "checking psp-config... not PSP, skipping" psp_config=""; @@ -1487,10 +1487,10 @@ detect_pspconfig() { exit 1 fi - if [ "$with_pspconfig" = "1" ] || [ "$with_pspconfig" = "" ] || [ "$with_pspconfig" = "2" ]; then + if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then psp_config="psp-config" else - psp_config="$with_pspconfig" + psp_config="$with_psp_config" fi version=`$psp_config -p 2>/dev/null` @@ -1504,8 +1504,8 @@ detect_pspconfig() { log 1 "configure: error: psp-config couldn't be found" # It was forced, so it should be found. - if [ "$with_pspconfig" != "1" ]; then - log 1 "configure: error: you supplied '$with_pspconfig', but it seems invalid" + if [ "$with_psp_config" != "1" ]; then + log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid" fi exit 1 fi |