--- uae/configure 2018/04/24 17:16:05 1.1.1.22 +++ uae/configure 2018/04/24 17:21:22 1.1.1.25 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for UAE 0.8.26. +# Generated by GNU Autoconf 2.61 for UAE 0.8.29. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='UAE' PACKAGE_TARNAME='uae' -PACKAGE_VERSION='0.8.26' -PACKAGE_STRING='UAE 0.8.26' +PACKAGE_VERSION='0.8.29' +PACKAGE_STRING='UAE 0.8.29' PACKAGE_BUGREPORT='' ac_unique_file="amiga/source/transdisk.c" @@ -659,6 +659,9 @@ ac_ct_CC EXEEXT OBJEXT CPP +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA SET_MAKE MAKEDEPPRG FILEPRG @@ -690,6 +693,7 @@ NO_REORDER_CFLAGS LIBRARIES TARGET GFXOBJS +GUIOBJS RESOBJS ASMOBJS SCSIOBJS @@ -1213,7 +1217,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures UAE 0.8.26 to adapt to many kinds of systems. +\`configure' configures UAE 0.8.29 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1282,7 +1286,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of UAE 0.8.26:";; + short | recursive ) echo "Configuration of UAE 0.8.29:";; esac cat <<\_ACEOF @@ -1306,6 +1310,7 @@ Optional Packages: --with-sdl Use SDL library for low-level functions --with-sdl-sound Use SDL library for sound --with-sdl-gfx Use SDL library for graphics + --with-oss-sound Use OSS interface sound (default) --with-alsa Use ALSA library for sound --with-asciiart Use ncurses ascii art for graphics output --with-hostcc=x Use a x as compiler for the host system @@ -1384,7 +1389,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -UAE configure 0.8.26 +UAE configure 0.8.29 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1398,7 +1403,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by UAE $as_me 0.8.26, which was +It was created by UAE $as_me 0.8.29, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2905,6 +2910,117 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done + ;; +esac +done +IFS=$as_save_IFS + + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` @@ -3442,37 +3558,6 @@ rm -f conftest* { echo "$as_me:$LINENO: result: $uae_cv_prog_cc_watcom" >&5 echo "${ECHO_T}$uae_cv_prog_cc_watcom" >&6; } -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -3587,7 +3672,6 @@ NO_REORDER_CFLAGS= LDFLAGS="$LDFLAGS -L." HAVE_BEOS=no -HAVE_POS=no { echo "$as_me:$LINENO: checking for main in -lMedia_s" >&5 echo $ECHO_N "checking for main in -lMedia_s... $ECHO_C" >&6; } if test "${ac_cv_lib_Media_s_main+set}" = set; then @@ -3911,73 +3995,6 @@ else HAVE_SVGA_LIB=no fi -{ echo "$as_me:$LINENO: checking for AFOpenAudioConn in -lAF" >&5 -echo $ECHO_N "checking for AFOpenAudioConn in -lAF... $ECHO_C" >&6; } -if test "${ac_cv_lib_AF_AFOpenAudioConn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lAF $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char AFOpenAudioConn (); -int -main () -{ -return AFOpenAudioConn (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_AF_AFOpenAudioConn=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_AF_AFOpenAudioConn=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_AF_AFOpenAudioConn" >&5 -echo "${ECHO_T}$ac_cv_lib_AF_AFOpenAudioConn" >&6; } -if test $ac_cv_lib_AF_AFOpenAudioConn = yes; then - HAVE_AF_LIB=yes -else - HAVE_AF_LIB=no -fi - { echo "$as_me:$LINENO: checking for waveOutGetNumDevs in -lmme" >&5 echo $ECHO_N "checking for waveOutGetNumDevs in -lmme... $ECHO_C" >&6; } if test "${ac_cv_lib_mme_waveOutGetNumDevs+set}" = set; then @@ -4313,6 +4330,73 @@ else HAVE_SGIAUDIO_LIB=no fi +{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5 +echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; } +if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snd_pcm_open (); +int +main () +{ +return snd_pcm_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_asound_snd_pcm_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_asound_snd_pcm_open=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; } +if test $ac_cv_lib_asound_snd_pcm_open = yes; then + HAVE_ALSA=yes +else + HAVE_ALSA=no +fi + { echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6; } @@ -7110,146 +7194,6 @@ fi done -for ac_header in dmedia/audio.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - for ac_header in libraries/cybergraphics.h cybergraphx/cybergraphics.h do @@ -9011,6 +8955,411 @@ cat >>confdefs.h <<_ACEOF _ACEOF +{ echo "$as_me:$LINENO: checking for void *" >&5 +echo $ECHO_N "checking for void *... $ECHO_C" >&6; } +if test "${ac_cv_type_void_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef void * ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_void_p=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_void_p=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +echo "${ECHO_T}$ac_cv_type_void_p" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of void *" >&5 +echo $ECHO_N "checking size of void *... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_void_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_void_p=$ac_lo;; +'') if test "$ac_cv_type_void_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_void_p=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_void_p=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_void_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_void_p=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOID_P $ac_cv_sizeof_void_p +_ACEOF + + { echo "$as_me:$LINENO: checking for long long" >&5 echo $ECHO_N "checking for long long... $ECHO_C" >&6; } if test "${ac_cv_type_long_long+set}" = set; then @@ -11514,7 +11863,7 @@ if test "$ac_res" != no; then ac_cv_func_getmntent=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_GETMNTENT +#define HAVE_GETMNTENT 1 _ACEOF else @@ -12731,34 +13080,6 @@ _ACEOF fi -if [ $target = "p.os" ]; then - HAVE_POS=yes -else - { echo "$as_me:$LINENO: checking for pOS" >&5 -echo $ECHO_N "checking for pOS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __POS__ - yes - #endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; HAVE_POS=yes -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; }; HAVE_POS=no -fi -rm -f conftest* - -fi - if test "$SDL_CONFIG" = "not-found" ; then HAVE_SDL_LIB=no else @@ -13008,6 +13329,64 @@ rm -f core conftest.err conftest.$ac_obj CFLAGS=$TMP_SAVE_CFLAGS LIBS=$TMP_SAVE_LIBS +HAVE_OSS_SOUND=no +if [ "x$ac_cv_header_sys_soundcard_h" = "xyes" -o "x$ac_cv_header_machine_soundcard_h" = "xyes" ]; then + { echo "$as_me:$LINENO: checking whether sys/soundcard.h or machine/soundcard.h works" >&5 +echo $ECHO_N "checking whether sys/soundcard.h or machine/soundcard.h works... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include "confdefs.h" +#ifdef HAVE_SYS_SOUNDCARD_H +#include +#else +#include +#endif +#include + +int +main () +{ +int soundfd; ioctl (soundfd, SNDCTL_DSP_GETFMTS, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +HAVE_OSS_SOUND=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + DO_PROFILING=no WANT_SVGALIB=dunno WANT_ASCIIART=dunno @@ -13046,6 +13425,12 @@ if test "${with_sdl_gfx+set}" = set; the fi +# Check whether --with-oss-sound was given. +if test "${with_oss_sound+set}" = set; then + withval=$with_oss_sound; WANT_OSS=$withval +fi + + # Check whether --with-alsa was given. if test "${with_alsa+set}" = set; then withval=$with_alsa; WANT_ALSA=$withval @@ -13082,6 +13467,50 @@ fi +mkdir -p src/tools +progname=$0 +srcd=`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +topsrcdir=`cd $srcd; pwd` +tcc=$CC +CC=$HOSTCC +(cd src/tools && $topsrcdir/src/tools/configure) +CC=$tcc + + +if [ "x$WANT_ALSA" = "xyes" ]; then + if [ "x$HAVE_ALSA" = "xno" ]; then + echo "Could not find libasound, disabling ALSA support." + NR_ERRORS=`expr $NR_ERRORS + 1` + WANT_ALSA=no + else + LIBS="$LIBS -lasound" + fi +fi + +if [ "x$WANT_OSS" = "xyes" ]; then + if [ "x$HAVE_OSS_SOUND" = "xno" ]; then + echo "Could not find OSS interface, disabling OSS support." + NR_ERRORS=`expr $NR_ERRORS + 1` + WANT_ALSA=no + else + LIBS="$LIBS -lasound" + fi +fi + +if [ "x$WANT_SDLSND" = "xyes" ]; then + if [ "x$WANT_ALSA" = "xyes" -o "x$WANT_OSS" = "xyes" ]; then + echo "Multiple sound backends selected; disabling SDL sound." + WANT_SDLSND=no + fi +fi + +if [ "x$WANT_ALSA" = "xyes" ]; then + if [ "x$WANT_OSS" = "xyes" ]; then + echo "Multiple sound backends selected; disabling ALSA." + WANT_ALSA=no + fi +fi + if [ "x$WANT_SDLSND" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then WANT_SDL=yes fi @@ -13099,10 +13528,6 @@ if [ "x$WANT_SDL" = "xyes" ]; then fi fi -if [ "x$WANT_ALSA" = "xyes" ]; then - LIBS="$LIBS -lasound" -fi - if [ "x$WANT_DGA" = "xyes" ]; then if [ "x$WANT_SVGALIB" = "xyes" -o "x$WANT_ASCIIART" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then echo "You can't enable DGA for SVGAlib, SDL and ncurses targets!" @@ -13315,7 +13740,7 @@ fi fi #GTK_PACKAGES="gtk+-2.0" -#GTK_REQUIRED_VERSION=2.1.3 +#GTK_REQUIRED_VERSION=2.4.0 #PKG_CHECK_MODULES(DEPS, $GTK_PACKAGES >= $GTK_REQUIRED_VERSION) #GTK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES $GTK_PACKAGES $LIBGNOMECANVAS_PACKAGES` #GTK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES $GTK_PACKAGES $LIBGNOMECANVAS_PACKAGES` @@ -13394,7 +13819,7 @@ fi no_gtk=yes fi - min_gtk_version=2.0.0 + min_gtk_version=2.4.0 { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } @@ -13713,6 +14138,9 @@ fi MATHLIB=-lm DEBUGOBJS="debug.o" +GUIDEP=gui-none +GUIOBJS_IN=nogui.o + { echo "$as_me:$LINENO: checking which target to use" >&5 echo $ECHO_N "checking which target to use... $ECHO_C" >&6; } @@ -13740,12 +14168,6 @@ echo "${ECHO_T}BeOS" >&6; } TARGETDEP=t-beos.h GFXOBJS=osdep/beos.o OPTIMIZE_CFLAGS=-O7 -else if [ "x$HAVE_POS" = "xyes" ]; then - { echo "$as_me:$LINENO: result: p.OS" >&5 -echo "${ECHO_T}p.OS" >&6; } - TARGET=p_os - TARGETDEP=t-pos.h - GFXOBJS="osdep/pos-win.o osdep/pos-disk.o osdep/pos-rexx.o" else if [ "x$HAVE_AMIGA_LIB" = "xyes" ]; then { echo "$as_me:$LINENO: result: AmigaOS" >&5 echo "${ECHO_T}AmigaOS" >&6; } @@ -13819,7 +14241,6 @@ fi fi fi fi -fi if [ "x$HAVE_DIRECTX" = "xyes" ]; then TARGETDEP=t-win32.h @@ -13831,8 +14252,6 @@ if [ "x$WANT_UI" != "xno" ]; then GUIOBJS=osdep/win32gui.o else if [ "x$HAVE_AMIGA_LIB" = "xyes" ]; then GUIOBJS="osdep/ami-gui.o" - else if [ "x$HAVE_POS" = "xyes" ]; then - GUIOBJS="osdep/pos-gui.o" else if [ "x$WANT_NCURSES_UI" = "xyes" ]; then if [ "x$HAVE_NCURSES_LIB" = "xno" ]; then echo "ncurses is unavailable, can't provide a user interface" @@ -13840,7 +14259,6 @@ if [ "x$WANT_UI" != "xno" ]; then NR_ERRORS=`expr $NR_ERRORS + 1` fi WANT_UI=no - GUIOBJS=nogui.o else GUIOBJS="tui.o svgancui.o" LIBRARIES="$LIBRARIES -lncurses" @@ -13855,33 +14273,27 @@ if [ "x$WANT_UI" != "xno" ]; then if [ "x$no_gtk" = "xyes" ]; then echo "Did not find gtk+, disabling user interface" GTK_CFLAGS= - GUIOBJS=nogui.o if [ "x$WANT_UI" = "xyes" ]; then NR_ERRORS=`expr $NR_ERRORS + 1` fi else echo "Using gtk+ GUI." NEED_THREAD_SUPPORT=yes - DDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_GTK_GUI" - GUIOBJS=gtkui.o + ADDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_GTK_GUI -I$abssrcdir/src/gui-gtk" + GUIDEP=gui-gtk + GUIOBJS_IN="gtkui.o util.o" fi else if [ "x$WANT_UI" = "xyes" ]; then echo "GUI requested, but no suitable libraries found." NR_ERRORS=`expr $NR_ERRORS + 1` fi - GUIOBJS=nogui.o - fi fi fi fi fi -else - GUIOBJS=nogui.o fi -GFXOBJS="$GFXOBJS $GUIOBJS" - cat >>confdefs.h <<\_ACEOF @@ -13908,11 +14320,39 @@ HAVEGCC27=no HAVEI386=no HAVE68K=no HAVEPPC=no -HAVEGLIBC2=no ASMOBJS= CPUOBJS=cpuemu.o +{ echo "$as_me:$LINENO: checking host cpu support" >&5 +echo $ECHO_N "checking host cpu support... $ECHO_C" >&6; } + +HOST_CPU=generic +MDFPP_H=fpp-unknown.h + +case $host_cpu in + i[3-6]86) + HOST_CPU=i386 + MDFPP_H=fpp-ieee.h + ;; + amd64 | x86_64) + HOST_CPU=amd64 + MDFPP_H=fpp-ieee.h + ;; + powerpc) + HOST_CPU=ppc + MDFPP_H=fpp-ieee.h + ;; + m68k) + HOST_CPU=68k + MDFPP_H=fpp-ieee.h + ;; +esac + +{ echo "$as_me:$LINENO: result: $HOST_CPU" >&5 +echo "${ECHO_T}$HOST_CPU" >&6; } +MACHDEP="md-$HOST_CPU" + { echo "$as_me:$LINENO: checking for GCC 2.7 or higher" >&5 echo $ECHO_N "checking for GCC 2.7 or higher... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -13938,51 +14378,13 @@ rm -f conftest* if test $ac_cv_c_compiler_gnu = yes; then - if test $HAVEGCC27 != yes; then - echo "I suggest you upgrade to at least version 2.7 of GCC" - fi -else - if test $uae_cv_prog_cc_watcom != yes; then - echo "Couldn't find GCC. UAE may or may not compile and run correctly." - NR_WARNINGS=`expr $NR_WARNINGS + 1` - fi -fi - -if [ "x$ac_cv_header_features_h" = "xyes" ]; then - { echo "$as_me:$LINENO: checking for glibc-2.0 or higher" >&5 -echo $ECHO_N "checking for glibc-2.0 or higher... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if __GLIBC__ - 1 >= 1 - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; HAVEGLIBC2=yes -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f conftest* - -fi - -if test $ac_cv_c_compiler_gnu = yes; then WARNING_CFLAGS="-Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes" OPTIMIZE_CFLAGS="-O2 -fomit-frame-pointer" CFLAGS= fi if [ "x$DO_PROFILING" = "xyes" ]; then - if [ "x$CC" = "xgcc" ]; then + if test $ac_cv_c_compiler_gnu = yes; then OPTIMIZE_CFLAGS="-O" DEBUG_CFLAGS="-g -fno-inline -fno-omit-frame-pointer -pg -DUSE_PROFILING" LDFLAGS="-pg" @@ -13995,93 +14397,24 @@ fi CFLAGS="$OPTIMIZE_CFLAGS $DEBUG_CFLAGS $WARNING_CFLAGS $CFLAGS $ADDITIONAL_CFLAGS" -if [ "x$HAVEGCC27" = "xyes" ]; then - CFLAGS="$CFLAGS -DGCCCONSTFUNC=\"__attribute__((const))\"" -else - CFLAGS="$CFLAGS -DGCCCONSTFUNC=" -fi - -{ echo "$as_me:$LINENO: checking for x86 target CPU" >&5 -echo $ECHO_N "checking for x86 target CPU... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __i386__ - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; HAVEI386=yes -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f conftest* - - -{ echo "$as_me:$LINENO: checking for m68k target CPU" >&5 -echo $ECHO_N "checking for m68k target CPU... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __m68k__ - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; HAVE68K=yes -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f conftest* - - -{ echo "$as_me:$LINENO: checking for ppc target CPU" >&5 -echo $ECHO_N "checking for ppc target CPU... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __powerpc__ - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; HAVEPPC=yes +if test $ac_cv_c_compiler_gnu = yes; then + if test $HAVEGCC27 != yes; then + { echo "$as_me:$LINENO: WARNING: Version 2.7 or better of GCC is recommended" >&5 +echo "$as_me: WARNING: Version 2.7 or better of GCC is recommended" >&2;} + NR_WARNINGS=`expr $NR_WARNINGS + 1` + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + if test $uae_cv_prog_cc_watcom != yes; then + { echo "$as_me:$LINENO: WARNING: UAE may not compile and run correctly with your compiler" >&5 +echo "$as_me: WARNING: UAE may not compile and run correctly with your compiler" >&2;} + NR_WARNINGS=`expr $NR_WARNINGS + 1` + fi fi -rm -f conftest* - -if MACHINE=`uname -a 2>/dev/null`; then - case "$MACHINE" in - Linux*) - HAVELINUX=yes - ;; - esac +if test $ac_cv_c_compiler_gnu = yes; then + if [ "$HOST_CPU" = i386 -o "$HOST_CPU" = ppc -o "$HOST_CPU" = amd64 ]; then + MACHDEP="$MACHDEP-gcc" + fi fi @@ -14333,25 +14666,6 @@ else if [ "x$HAVEGCC27" = "xyes" -a "x$H if [ "x$HAVE_MOTO_LIB" = "xyes" ]; then MATHLIB="-lmoto $MATHLIB" fi -else if [ "x$TARGET" = "xp_os" ]; then - CPU=`uname -m` - if [ "x$CPU" = "xm68k" ]; then - MACHDEP=md-68k - CFLAGS="$CFLAGS -DUNALIGNED_PROFITABLE -DREGPARAM=\"__attribute__((regparm(4)))\" -DM68K_FLAG_OPT=1" - else if [ "x$CPU" = "xppc" ]; then - MACHDEP=md-ppc - CFLAGS="$CFLAGS -DREGPARAM=" - else if [ "x$CPU" = "xi386" ]; then - MACHDEP=md-i386-gcc - CFLAGS="$CFLAGS -DX86_ASSEMBLY -fno-strength-reduce -DREGPARAM=\"__attribute__((regparm(3)))\"" - else - echo "Unsupported CPU: $CPU!" - exit 5 - fi - fi - fi - CFLAGS="$CFLAGS -nostdinc -I/gg/include -I/p/../inc -D__POS__" - OSDEP=od-pos else if [ "x$TARGET" = "xamigaos" ]; then OSDEP=od-amiga CPU=`uname -m` @@ -14380,7 +14694,6 @@ fi fi fi fi -fi FSDBOBJS=fsdb_unix.o if [ "x$TARGET" = "xwin32" ]; then @@ -14398,72 +14711,10 @@ fi fi if [ "x$TARGET" = "xx11" -o "x$TARGET" = "xsvgalib" -o "x$TARGET" = "xamigaos" \ - -o "x$TARGET" = "xbeos" -o "x$TARGET" = "xasciiart" -o "x$TARGET" = "xp_os" ]; then + -o "x$TARGET" = "xbeos" -o "x$TARGET" = "xasciiart" ]; then CFLAGS="$CFLAGS -DUSE_ZFILE" fi -HAVE_USS_SOUND=no -if [ "x$ac_cv_header_sys_soundcard_h" = "xyes" -o "x$ac_cv_header_machine_soundcard_h" = "xyes" ]; then - { echo "$as_me:$LINENO: checking whether sys/soundcard.h or machine/soundcard.h works" >&5 -echo $ECHO_N "checking whether sys/soundcard.h or machine/soundcard.h works... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include "confdefs.h" -#ifdef HAVE_SYS_SOUNDCARD_H -#include -#else -#include -#endif -#include - -int -main () -{ -int soundfd; ioctl (soundfd, SNDCTL_DSP_GETFMTS, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -HAVE_USS_SOUND=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -if [ "x$ac_cv_header_dmedia_audio.h" = "xno" ]; then - HAVE_SGIAUDIO_LIB=no -fi - { echo "$as_me:$LINENO: checking which sound system to use" >&5 echo $ECHO_N "checking which sound system to use... $ECHO_C" >&6; } # Check whether --enable-file-sound was given. @@ -14483,14 +14734,18 @@ echo "${ECHO_T}SDL" >&6; } SOUNDDEP=sd-sdl USE_SOUND=yes NEED_THREAD_SUPPORT=yes + if [ "x$HAVE_ALSA" = "xyes" -o "x$HAVE_OSS_SOUND" = "xyes" ]; then + NR_WARNINGS=`expr $NR_WARNINGS + 1` + echo "SDL sound support was selected, but OSS or ALSA are more reliable." + fi else if [ "x$WANT_ALSA" = "xyes" ]; then { echo "$as_me:$LINENO: result: ALSA" >&5 echo "${ECHO_T}ALSA" >&6; } SOUNDDEP=sd-alsa USE_SOUND=yes -else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then - { echo "$as_me:$LINENO: result: USS" >&5 -echo "${ECHO_T}USS" >&6; } +else if [ "x$HAVE_OSS_SOUND" = "xyes" ]; then + { echo "$as_me:$LINENO: result: OSS" >&5 +echo "${ECHO_T}OSS" >&6; } SOUNDDEP=sd-uss USE_SOUND=yes else if [ "x$ac_cv_header_sys_audioio_h" = "xyes" -o "x$ac_cv_header_sun_audioio_h" = "xyes" ]; then @@ -14498,29 +14753,12 @@ else if [ "x$ac_cv_header_sys_audioio_h" echo "${ECHO_T}Solaris/NetBSD" >&6; } SOUNDDEP=sd-solaris USE_SOUND=yes -else if [ "x$HAVE_AF_LIB" = "xyes" ]; then - { echo "$as_me:$LINENO: result: AF sound" >&5 -echo "${ECHO_T}AF sound" >&6; } - SOUNDDEP=sd-af - LIBS="$LIBS -lAF" - USE_SOUND=yes -else if [ "x$HAVE_SGIAUDIO_LIB" = "xyes" ]; then - { echo "$as_me:$LINENO: result: SGI sound" >&5 -echo "${ECHO_T}SGI sound" >&6; } - SOUNDDEP=sd-sgi - LIBS="$LIBS -laudio" - USE_SOUND=yes else if [ "x$HAVE_MME_LIB" = "xyes" ]; then { echo "$as_me:$LINENO: result: MME sound" >&5 echo "${ECHO_T}MME sound" >&6; } SOUNDDEP=sd-mme LIBS="$LIBS -lmme" USE_SOUND=yes -else if [ "x$TARGET" = "xp_os" ]; then - { echo "$as_me:$LINENO: result: pAudio.device" >&5 -echo "${ECHO_T}pAudio.device" >&6; } - SOUNDDEP=od-pos - USE_SOUND=yes else if [ "x$TARGET" = "xamigaos" ]; then if [ "x$ac_cv_header_devices_ahi_h" = "xyes" ]; then { echo "$as_me:$LINENO: result: Amiga AHI.device" >&5 @@ -14553,9 +14791,6 @@ fi fi fi fi -fi -fi -fi if [ "x$NEED_THREAD_SUPPORT" = "xyes" ]; then if [ "x$USE_THREADS" != "xyes" ]; then @@ -14566,6 +14801,7 @@ fi if [ "x$USE_THREADS" = "xyes" -o "x$NEED_THREAD_SUPPORT" = "xyes" ]; then if [ "x$WANT_SDL" = "xyes" ]; then THREADDEP=td-sdl + CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT" else if [ "x$HAVE_PTHREAD_LIB" = "xyes" ]; then THREADDEP=td-posix CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT" @@ -14578,10 +14814,6 @@ if [ "x$USE_THREADS" = "xyes" -o "x$NEED CFLAGS="$CFLAGS -DUAE_FILESYS_THREADS" fi - if [ "x$HAVELINUX" = "xno" -o "x$HAVEGLIBC2" = "xno" ]; then - echo "Thread support has only been tested on Linux systems with glibc-2.0" - NR_WARNINGS=`expr $NR_WARNINGS + 1` - fi if [ "x$TARGET" = "xsvgalib" ]; then echo "If you didn't compile a fixed version of SVGAlib then thread support" echo "in UAE will lock your machine real hard." @@ -14718,6 +14950,7 @@ fi rm -f src/machdep rm -f src/osdep +rm -rf src/guidep rm -f src/threaddep rm -f src/sounddep rm -f src/scsidep @@ -14728,7 +14961,7 @@ rm -f src/md-support.c rm -f src/md-X86.S rm -f src/scsi-support.c -if [ "x$TARGET" = "xamigaos" -o "x$TARGET" = "xp_os" ]; then +if [ "x$TARGET" = "xamigaos" ]; then { echo "$as_me:$LINENO: checking which CPU to use" >&5 echo $ECHO_N "checking which CPU to use... $ECHO_C" >&6; } cpu=`cpu | cut -d' ' -f2` @@ -14749,54 +14982,77 @@ echo "${ECHO_T}none" >&6; } fi fi +if [ "x$DO_PROFILING" = "xyes" ]; then + echo "Building a profiling version of UAE (select this option only if you know" + echo "what you are doing)" +fi +if test -f $abssrcdir/src/target.h +then + echo + echo "Fatal error: Can't configure in the current directory, because" + echo "configure was run in the source directory. Go to the source" + echo "directory, type" + echo " make streifenfrei" + echo "and try again." + exit 1 +fi +ac_config_links="$ac_config_links src/osdep:src/$OSDEP" +ac_config_links="$ac_config_links src/sounddep:src/$SOUNDDEP" +ac_config_links="$ac_config_links src/threaddep:src/$THREADDEP" +ac_config_links="$ac_config_links src/machdep:src/$MACHDEP" +mkdir src/guidep +for x in $GUIOBJS_IN; do + src=`echo $x |sed s,'\.o$,.c,'` + ac_config_links="$ac_config_links src/guidep/$src:src/$GUIDEP/$src" + GUIOBJS="$GUIOBJS guidep/$x" +done +echo "#include \"$abssrcdir/src/targets/$TARGETDEP\"" > src/target.h + +echo "#include \"$abssrcdir/src/$SOUNDDEP/sound.c\"" >src/sd-sound.c +echo "#include \"$abssrcdir/src/$OD_JOYSTICK\"" >src/od-joy.c +echo "#include \"$abssrcdir/src/$MACHDEP/support.c\"" >src/md-support.c + +if [ "x$MACHDEP" = "xmd-i386-gcc" ]; then + echo "#include \"machdep/X86.S\"" >src/md-X86.S +fi +echo "#include \"$abssrcdir/src/include/$FPP_H\"" >src/md-fpp.h + +mkdir -p src/keymap + -ac_config_files="$ac_config_files src/Makefile Makefile" -if [ "x$DO_PROFILING" = "xyes" ]; then - echo "Building a profiling version of UAE (select this option only if you know" - echo "what you are doing)" -fi -if test -f $abssrcdir/src/target.h -then - echo - echo "Fatal error: Can't configure in the current directory, because" - echo "configure was run in the source directory. Go to the source" - echo "directory, type" - echo " make streifenfrei" - echo "and try again." - exit 1 -fi -ac_config_links="$ac_config_links src/osdep:src/$OSDEP" -ac_config_links="$ac_config_links src/sounddep:src/$SOUNDDEP" -ac_config_links="$ac_config_links src/threaddep:src/$THREADDEP" -ac_config_links="$ac_config_links src/machdep:src/$MACHDEP" + + + + +ac_config_files="$ac_config_files src/Makefile Makefile" cat >confcache <<\_ACEOF @@ -15195,7 +15451,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by UAE $as_me 0.8.26, which was +This file was extended by UAE $as_me 0.8.29, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15248,7 +15504,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -UAE config.status 0.8.26 +UAE config.status 0.8.29 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -15258,6 +15514,7 @@ gives unlimited permission to copy, dist ac_pwd='$ac_pwd' srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -15356,12 +15613,13 @@ for ac_config_target in $ac_config_targe do case $ac_config_target in "src/sysconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS src/sysconfig.h" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/osdep") CONFIG_LINKS="$CONFIG_LINKS src/osdep:src/$OSDEP" ;; "src/sounddep") CONFIG_LINKS="$CONFIG_LINKS src/sounddep:src/$SOUNDDEP" ;; "src/threaddep") CONFIG_LINKS="$CONFIG_LINKS src/threaddep:src/$THREADDEP" ;; "src/machdep") CONFIG_LINKS="$CONFIG_LINKS src/machdep:src/$MACHDEP" ;; + "src/guidep/$src") CONFIG_LINKS="$CONFIG_LINKS src/guidep/$src:src/$GUIDEP/$src" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -15469,6 +15727,9 @@ ac_ct_CC!$ac_ct_CC$ac_delim EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim CPP!$CPP$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim SET_MAKE!$SET_MAKE$ac_delim MAKEDEPPRG!$MAKEDEPPRG$ac_delim FILEPRG!$FILEPRG$ac_delim @@ -15500,6 +15761,7 @@ NO_REORDER_CFLAGS!$NO_REORDER_CFLAGS$ac_ LIBRARIES!$LIBRARIES$ac_delim TARGET!$TARGET$ac_delim GFXOBJS!$GFXOBJS$ac_delim +GUIOBJS!$GUIOBJS$ac_delim RESOBJS!$RESOBJS$ac_delim ASMOBJS!$ASMOBJS$ac_delim SCSIOBJS!$SCSIOBJS$ac_delim @@ -15512,7 +15774,7 @@ top_srcdir!$top_srcdir$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -15735,6 +15997,10 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ # CONFIG_FILE # + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -15787,6 +16053,7 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out @@ -15963,25 +16230,6 @@ if test "$no_create" != yes; then fi -echo "#include \"$abssrcdir/src/targets/$TARGETDEP\"" > src/target.h - -echo "#include \"$abssrcdir/src/$SOUNDDEP/sound.c\"" >src/sd-sound.c -echo "#include \"$abssrcdir/src/$OD_JOYSTICK\"" >src/od-joy.c -echo "#include \"$abssrcdir/src/$MACHDEP/support.c\"" >src/md-support.c - -if [ "x$MACHDEP" = "xmd-i386-gcc" ]; then - echo "#include \"machdep/X86.S\"" >src/md-X86.S -fi -echo "#include \"$abssrcdir/src/include/$FPP_H\"" >src/md-fpp.h - -mkdir -p src/tools -mkdir -p src/keymap -progname=$0 -srcd=`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -topsrcdir=`cd $srcd; pwd` -cd src/tools -CC=$HOSTCC $topsrcdir/src/tools/configure - echo echo if [ "x$NR_ERRORS" = "x0" ]; then @@ -15996,3 +16244,4 @@ else echo "not get all the features you asked for." fi echo +