Search
lxdream.org :: lxdream/configure :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure
changeset 1239:be3121267597
prev1235:8da2f3dad9c0
next1245:01e0020adf88
author nkeynes
date Tue Feb 28 17:25:26 2012 +1000 (9 years ago)
permissions -rw-r--r--
last change Implement display output for the GLES2 case (no fixed function
rendering)
file annotate diff log raw
1.1 --- a/configure Fri Feb 24 21:11:58 2012 +1000
1.2 +++ b/configure Tue Feb 28 17:25:26 2012 +1000
1.3 @@ -682,6 +682,13 @@
1.4 host_cpu
1.5 host_vendor
1.6 host_os
1.7 +ANT
1.8 +ANDROID_SDK_HOME
1.9 +ANDROID_NDK_HOME
1.10 +ANDROID_SDK_VERSION
1.11 +ANDROID_GDBSERVER
1.12 +GUI_ANDROID_TRUE
1.13 +GUI_ANDROID_FALSE
1.14 CC
1.15 CFLAGS
1.16 LDFLAGS
1.17 @@ -1455,6 +1462,9 @@
1.18 Optional Packages:
1.19 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1.20 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1.21 + --with-android=SDK Specify the location of the Android SDK
1.22 + --with-android-ndk=NDK Specify the location of the Android NDK
1.23 + --with-android-version Specify target Android SDK version
1.24 --with-osmesa Build with the osmesa GL library (software
1.25 rendering)
1.26 --with-gtk Build with the GTK UI. Default on X11 systems
1.27 @@ -2508,6 +2518,236 @@
1.28
1.29
1.30
1.31 +# LX_ANDROID_BUILD
1.32 +# Defines --with-android, --with-android-ndk, and --with-android-version
1.33 +# If specified, checks for a working install, and sets build parameters
1.34 +# appropriately for an Android host.
1.35 +
1.36 +
1.37 +
1.38 +
1.39 +
1.40 +# Check whether --with-android was given.
1.41 +if test "${with_android+set}" = set; then
1.42 + withval=$with_android;
1.43 +fi
1.44 +
1.45 +
1.46 +# Check whether --with-android-ndk was given.
1.47 +if test "${with_android_ndk+set}" = set; then
1.48 + withval=$with_android_ndk;
1.49 +fi
1.50 +
1.51 +
1.52 +# Check whether --with-android-version was given.
1.53 +if test "${with_android_version+set}" = set; then
1.54 + withval=$with_android_version;
1.55 +else
1.56 + with_android_version="android-8"
1.57 +fi
1.58 +
1.59 +
1.60 + if test "x$with_android" != "x"; then
1.61 + if test "$with_android" = "yes"; then
1.62 + { { echo "$as_me:$LINENO: error: --with-android option must be given with the path to the Android SDK " >&5
1.63 +echo "$as_me: error: --with-android option must be given with the path to the Android SDK " >&2;}
1.64 + { (exit 1); exit 1; }; }
1.65 + fi
1.66 + if test "x$with_android_ndk" = "x" -o "x$with_android_ndk" = "xyes"; then
1.67 + { { echo "$as_me:$LINENO: error: --with-android-ndk=/path/to/ndk option must be used with --with-android " >&5
1.68 +echo "$as_me: error: --with-android-ndk=/path/to/ndk option must be used with --with-android " >&2;}
1.69 + { (exit 1); exit 1; }; }
1.70 + fi
1.71 +
1.72 + ANDROID_SDK_HOME="$with_android"
1.73 + ANDROID_NDK_HOME="$with_android_ndk"
1.74 + ANDROID_SDK_VERSION="$with_android_version"
1.75 +
1.76 + as_ac_File=`echo "ac_cv_file_$ANDROID_SDK_HOME/tools/ant/pre_setup.xml" | $as_tr_sh`
1.77 +{ echo "$as_me:$LINENO: checking for $ANDROID_SDK_HOME/tools/ant/pre_setup.xml" >&5
1.78 +echo $ECHO_N "checking for $ANDROID_SDK_HOME/tools/ant/pre_setup.xml... $ECHO_C" >&6; }
1.79 +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
1.80 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.81 +else
1.82 + test "$cross_compiling" = yes &&
1.83 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
1.84 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
1.85 + { (exit 1); exit 1; }; }
1.86 +if test -r "$ANDROID_SDK_HOME/tools/ant/pre_setup.xml"; then
1.87 + eval "$as_ac_File=yes"
1.88 +else
1.89 + eval "$as_ac_File=no"
1.90 +fi
1.91 +fi
1.92 +ac_res=`eval echo '${'$as_ac_File'}'`
1.93 + { echo "$as_me:$LINENO: result: $ac_res" >&5
1.94 +echo "${ECHO_T}$ac_res" >&6; }
1.95 +if test `eval echo '${'$as_ac_File'}'` = yes; then
1.96 + :
1.97 +else
1.98 + { { echo "$as_me:$LINENO: error: Android SDK not found in $ANDROID_SDK_HOME" >&5
1.99 +echo "$as_me: error: Android SDK not found in $ANDROID_SDK_HOME" >&2;}
1.100 + { (exit 1); exit 1; }; }
1.101 +fi
1.102 +
1.103 + as_ac_File=`echo "ac_cv_file_$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties" | $as_tr_sh`
1.104 +{ echo "$as_me:$LINENO: checking for $ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties" >&5
1.105 +echo $ECHO_N "checking for $ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties... $ECHO_C" >&6; }
1.106 +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
1.107 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.108 +else
1.109 + test "$cross_compiling" = yes &&
1.110 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
1.111 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
1.112 + { (exit 1); exit 1; }; }
1.113 +if test -r "$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties"; then
1.114 + eval "$as_ac_File=yes"
1.115 +else
1.116 + eval "$as_ac_File=no"
1.117 +fi
1.118 +fi
1.119 +ac_res=`eval echo '${'$as_ac_File'}'`
1.120 + { echo "$as_me:$LINENO: result: $ac_res" >&5
1.121 +echo "${ECHO_T}$ac_res" >&6; }
1.122 +if test `eval echo '${'$as_ac_File'}'` = yes; then
1.123 + :
1.124 +else
1.125 + { { echo "$as_me:$LINENO: error: Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME" >&5
1.126 +echo "$as_me: error: Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME" >&2;}
1.127 + { (exit 1); exit 1; }; }
1.128 +fi
1.129 +
1.130 + as_ac_File=`echo "ac_cv_file_$ANDROID_NDK_HOME/toolchains" | $as_tr_sh`
1.131 +{ echo "$as_me:$LINENO: checking for $ANDROID_NDK_HOME/toolchains" >&5
1.132 +echo $ECHO_N "checking for $ANDROID_NDK_HOME/toolchains... $ECHO_C" >&6; }
1.133 +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
1.134 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.135 +else
1.136 + test "$cross_compiling" = yes &&
1.137 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
1.138 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
1.139 + { (exit 1); exit 1; }; }
1.140 +if test -r "$ANDROID_NDK_HOME/toolchains"; then
1.141 + eval "$as_ac_File=yes"
1.142 +else
1.143 + eval "$as_ac_File=no"
1.144 +fi
1.145 +fi
1.146 +ac_res=`eval echo '${'$as_ac_File'}'`
1.147 + { echo "$as_me:$LINENO: result: $ac_res" >&5
1.148 +echo "${ECHO_T}$ac_res" >&6; }
1.149 +if test `eval echo '${'$as_ac_File'}'` = yes; then
1.150 + :
1.151 +else
1.152 + { { echo "$as_me:$LINENO: error: Android NDK not found in $ANDROID_NDK_HOME" >&5
1.153 +echo "$as_me: error: Android NDK not found in $ANDROID_NDK_HOME" >&2;}
1.154 + { (exit 1); exit 1; }; }
1.155 +fi
1.156 +
1.157 +
1.158 + case $host_alias in
1.159 + arm-* | "")
1.160 + host_alias="arm-linux-androideabi"
1.161 + host_cpu="arm"
1.162 + host_vendor="unknown";
1.163 + host_os="linux-androideabi"
1.164 + ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
1.165 + ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
1.166 + ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-arm"
1.167 + TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
1.168 + TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
1.169 + ;;
1.170 + i686-*)
1.171 + host_alias="i686-android-linux"
1.172 + host_cpu="i686"
1.173 + host_vendor="android"
1.174 + host_os="linux"
1.175 + ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
1.176 + ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
1.177 + ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_SDK_VERSION/arch-x86"
1.178 + TARGETFLAGS=""
1.179 + ;;
1.180 + *)
1.181 + { { echo "$as_me:$LINENO: error: Unsupported android host $host_alias" >&5
1.182 +echo "$as_me: error: Unsupported android host $host_alias" >&2;}
1.183 + { (exit 1); exit 1; }; }
1.184 + ;;
1.185 + esac
1.186 +
1.187 + # Extract the first word of "ant ", so it can be a program name with args.
1.188 +set dummy ant ; ac_word=$2
1.189 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.190 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.191 +if test "${ac_cv_path_ANT+set}" = set; then
1.192 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.193 +else
1.194 + case $ANT in
1.195 + [\\/]* | ?:[\\/]*)
1.196 + ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
1.197 + ;;
1.198 + *)
1.199 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.200 +for as_dir in $PATH
1.201 +do
1.202 + IFS=$as_save_IFS
1.203 + test -z "$as_dir" && as_dir=.
1.204 + for ac_exec_ext in '' $ac_executable_extensions; do
1.205 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.206 + ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
1.207 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.208 + break 2
1.209 + fi
1.210 +done
1.211 +done
1.212 +IFS=$as_save_IFS
1.213 +
1.214 + ;;
1.215 +esac
1.216 +fi
1.217 +ANT=$ac_cv_path_ANT
1.218 +if test -n "$ANT"; then
1.219 + { echo "$as_me:$LINENO: result: $ANT" >&5
1.220 +echo "${ECHO_T}$ANT" >&6; }
1.221 +else
1.222 + { echo "$as_me:$LINENO: result: no" >&5
1.223 +echo "${ECHO_T}no" >&6; }
1.224 +fi
1.225 +
1.226 +
1.227 +
1.228 + CC="$ANDROID_NDK_BIN/${host_alias}-gcc"
1.229 + CXX="$ANDROID_NDK_BIN/${host_alias}-g++"
1.230 + CPP="$ANDROID_NDK_BIN/${host_alias}-cpp"
1.231 + LD="$ANDROID_NDK_BIN/${host_alias}-ld"
1.232 + AR="$ANDROID_NDK_BIN/${host_alias}-ar"
1.233 + RANLIB="$ANDROID_NDK_BIN/${host_alias}-ranlib"
1.234 + STRIP="$ANDROID_NDK_BIN/${host_alias}-strip"
1.235 + OBJDUMP="$ANDROID_NDK_BIN/${host_alias}-objdump"
1.236 + CPPFLAGS="-fPIC --sysroot=$ANDROID_SYSROOT -I$ANDROID_SYSROOT/usr/include $TARGETFLAGS $CPPFLAGS"
1.237 + LDFLAGS="-nostdlib -Wl,--no-undefined -L${ANDROID_SYSROOT}/usr/lib -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib -Wl,-allow-shlib-undefined -Wl,-z,noexecstack $LDFLAGS"
1.238 + LIBS="$LIBS -liconv -llog -lgcc -lc"
1.239 +
1.240 +
1.241 +
1.242 +
1.243 +
1.244 +
1.245 + ANDROID_BUILD=yes
1.246 + cross_compiling=yes
1.247 + fi
1.248 +
1.249 +
1.250 +
1.251 +if test "$ANDROID_BUILD" = "yes"; then
1.252 + GUI_ANDROID_TRUE=
1.253 + GUI_ANDROID_FALSE='#'
1.254 +else
1.255 + GUI_ANDROID_TRUE='#'
1.256 + GUI_ANDROID_FALSE=
1.257 +fi
1.258 +
1.259 +
1.260 +
1.261
1.262 DEPDIR="${am__leading_dot}deps"
1.263
1.264 @@ -8727,6 +8967,17 @@
1.265
1.266
1.267
1.268 +if test "$ANDROID_BUILD" = "yes"; then
1.269 + with_gtk=no;
1.270 + EXTRA_OUTPUT_FILES="src/android/build.properties"
1.271 + LIBS="-lGLESv2 $LIBS"
1.272 +
1.273 +cat >>confdefs.h <<\_ACEOF
1.274 +#define HAVE_GLES2 1
1.275 +_ACEOF
1.276 +
1.277 + with_sdl=no
1.278 +else
1.279
1.280
1.281 ac_ext=m
1.282 @@ -9358,6 +9609,7 @@
1.283 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.284
1.285
1.286 +fi
1.287
1.288
1.289
1.290 @@ -9840,7 +10092,7 @@
1.291
1.292
1.293 fi
1.294 -if test "x$have_dlopen" = "xyes"; then
1.295 +if test "x$have_dlopen" = "xyes" -a "x$ANDROID_BUILD" != "xyes"; then
1.296
1.297 cat >>confdefs.h <<\_ACEOF
1.298 #define BUILD_PLUGINS 1
1.299 @@ -9849,7 +10101,7 @@
1.300 fi
1.301
1.302
1.303 -if test "x$have_dlopen" = "xyes"; then
1.304 +if test "x$have_dlopen" = "xyes" -a "x$ANDROID_BUILD" != "xyes"; then
1.305 BUILD_PLUGINS_TRUE=
1.306 BUILD_PLUGINS_FALSE='#'
1.307 else
1.308 @@ -11420,7 +11672,7 @@
1.309 else
1.310
1.311
1.312 - if test "x$APPLE_BUILD" != 'xyes'; then
1.313 + if test "x$APPLE_BUILD" != 'xyes' -a "x$ANDROID_BUILD" != 'xyes'; then
1.314
1.315 pkg_failed=no
1.316 { echo "$as_me:$LINENO: checking for LIBGL" >&5
1.317 @@ -12562,8 +12814,6 @@
1.318 fi
1.319
1.320
1.321 -
1.322 -
1.323 if test "x$enable_translator" != "xno"; then
1.324 case $host_cpu in
1.325 i386|i486|i586|i686|x86_64)
1.326 @@ -13135,7 +13385,8 @@
1.327
1.328
1.329
1.330 -if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.331 +if test "$ANDROID_BUILD" != "yes"; then
1.332 + if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.333 { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.334 echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
1.335 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.336 @@ -13319,7 +13570,7 @@
1.337 fi
1.338
1.339
1.340 -if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
1.341 + if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
1.342 { echo "$as_me:$LINENO: checking for IOKit/IOKitLib.h" >&5
1.343 echo $ECHO_N "checking for IOKit/IOKitLib.h... $ECHO_C" >&6; }
1.344 if test "${ac_cv_header_IOKit_IOKitLib_h+set}" = set; then
1.345 @@ -13446,13 +13697,14 @@
1.346 fi
1.347 if test $ac_cv_header_IOKit_IOKitLib_h = yes; then
1.348
1.349 - CDROM_DRIVER=osx
1.350 - LIBS="$LIBS -framework IOKit"
1.351 + CDROM_DRIVER=osx
1.352 + LIBS="$LIBS -framework IOKit"
1.353 else
1.354 true
1.355 fi
1.356
1.357
1.358 +fi
1.359
1.360
1.361 if test "x$CDROM_DRIVER" = "xlinux"; then
1.362 @@ -15704,6 +15956,13 @@
1.363 Usually this means the macro was only invoked conditionally." >&2;}
1.364 { (exit 1); exit 1; }; }
1.365 fi
1.366 +if test -z "${GUI_ANDROID_TRUE}" && test -z "${GUI_ANDROID_FALSE}"; then
1.367 + { { echo "$as_me:$LINENO: error: conditional \"GUI_ANDROID\" was never defined.
1.368 +Usually this means the macro was only invoked conditionally." >&5
1.369 +echo "$as_me: error: conditional \"GUI_ANDROID\" was never defined.
1.370 +Usually this means the macro was only invoked conditionally." >&2;}
1.371 + { (exit 1); exit 1; }; }
1.372 +fi
1.373 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
1.374 { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
1.375 Usually this means the macro was only invoked conditionally." >&5
1.376 @@ -16486,6 +16745,13 @@
1.377 host_cpu!$host_cpu$ac_delim
1.378 host_vendor!$host_vendor$ac_delim
1.379 host_os!$host_os$ac_delim
1.380 +ANT!$ANT$ac_delim
1.381 +ANDROID_SDK_HOME!$ANDROID_SDK_HOME$ac_delim
1.382 +ANDROID_NDK_HOME!$ANDROID_NDK_HOME$ac_delim
1.383 +ANDROID_SDK_VERSION!$ANDROID_SDK_VERSION$ac_delim
1.384 +ANDROID_GDBSERVER!$ANDROID_GDBSERVER$ac_delim
1.385 +GUI_ANDROID_TRUE!$GUI_ANDROID_TRUE$ac_delim
1.386 +GUI_ANDROID_FALSE!$GUI_ANDROID_FALSE$ac_delim
1.387 CC!$CC$ac_delim
1.388 CFLAGS!$CFLAGS$ac_delim
1.389 LDFLAGS!$LDFLAGS$ac_delim
1.390 @@ -16507,13 +16773,6 @@
1.391 CFLAGS!$CFLAGS$ac_delim
1.392 CPPFLAGS!$CPPFLAGS$ac_delim
1.393 CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
1.394 -ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
1.395 -CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
1.396 -am__fastdepCC_FOR_BUILD_TRUE!$am__fastdepCC_FOR_BUILD_TRUE$ac_delim
1.397 -am__fastdepCC_FOR_BUILD_FALSE!$am__fastdepCC_FOR_BUILD_FALSE$ac_delim
1.398 -CPP!$CPP$ac_delim
1.399 -CPPFLAGS!$CPPFLAGS$ac_delim
1.400 -CPP_FOR_BUILD!$CPP_FOR_BUILD$ac_delim
1.401 _ACEOF
1.402
1.403 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.404 @@ -16555,6 +16814,13 @@
1.405 ac_delim='%!_!# '
1.406 for ac_last_try in false false false false false :; do
1.407 cat >conf$$subs.sed <<_ACEOF
1.408 +ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
1.409 +CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
1.410 +am__fastdepCC_FOR_BUILD_TRUE!$am__fastdepCC_FOR_BUILD_TRUE$ac_delim
1.411 +am__fastdepCC_FOR_BUILD_FALSE!$am__fastdepCC_FOR_BUILD_FALSE$ac_delim
1.412 +CPP!$CPP$ac_delim
1.413 +CPPFLAGS!$CPPFLAGS$ac_delim
1.414 +CPP_FOR_BUILD!$CPP_FOR_BUILD$ac_delim
1.415 BUILD_EXEEXT!$BUILD_EXEEXT$ac_delim
1.416 BUILD_OBJEXT!$BUILD_OBJEXT$ac_delim
1.417 CFLAGS_FOR_BUILD!$CFLAGS_FOR_BUILD$ac_delim
1.418 @@ -16645,13 +16911,6 @@
1.419 BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
1.420 LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
1.421 GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
1.422 -USE_NLS!$USE_NLS$ac_delim
1.423 -MSGFMT!$MSGFMT$ac_delim
1.424 -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
1.425 -GMSGFMT!$GMSGFMT$ac_delim
1.426 -XGETTEXT!$XGETTEXT$ac_delim
1.427 -CATALOGS!$CATALOGS$ac_delim
1.428 -CATOBJEXT!$CATOBJEXT$ac_delim
1.429 _ACEOF
1.430
1.431 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.432 @@ -16693,6 +16952,13 @@
1.433 ac_delim='%!_!# '
1.434 for ac_last_try in false false false false false :; do
1.435 cat >conf$$subs.sed <<_ACEOF
1.436 +USE_NLS!$USE_NLS$ac_delim
1.437 +MSGFMT!$MSGFMT$ac_delim
1.438 +MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
1.439 +GMSGFMT!$GMSGFMT$ac_delim
1.440 +XGETTEXT!$XGETTEXT$ac_delim
1.441 +CATALOGS!$CATALOGS$ac_delim
1.442 +CATOBJEXT!$CATOBJEXT$ac_delim
1.443 DATADIRNAME!$DATADIRNAME$ac_delim
1.444 GMOFILES!$GMOFILES$ac_delim
1.445 INSTOBJEXT!$INSTOBJEXT$ac_delim
1.446 @@ -16706,7 +16972,7 @@
1.447 LTLIBOBJS!$LTLIBOBJS$ac_delim
1.448 _ACEOF
1.449
1.450 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
1.451 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
1.452 break
1.453 elif $ac_last_try; then
1.454 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
.