diff -Nru libmikmod-3.3.6/android/config.h libmikmod-3.3.7/android/config.h --- libmikmod-3.3.6/android/config.h 1970-01-01 00:00:00.000000000 +0000 +++ libmikmod-3.3.7/android/config.h 2014-06-20 07:55:50.000000000 +0000 @@ -0,0 +1,36 @@ +/* Customized config.h for Android builds */ + +/* Define if the OpenSL ES driver is compiled */ +#define DRV_OSLES 1 +/* Define if you want an .aiff file writer driver */ +/* #define DRV_AIFF */ +/* Define if you want a raw pcm data file writer driver */ +/* #define DRV_RAW */ +/* Define if you want a .wav file writer driver */ +/* #define DRV_WAV */ + +/* Define if your system provides POSIX.4 threads */ +#define HAVE_PTHREAD 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#undef WORDS_BIGENDIAN + +#define HAVE_UNISTD_H 1 +#define HAVE_FCNTL_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_SETENV 1 +#define HAVE_SNPRINTF 1 +#define HAVE_SRANDOM 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRDUP 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRSTR 1 +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_WAIT_H 1 diff -Nru libmikmod-3.3.6/android/jni/Android.mk libmikmod-3.3.7/android/jni/Android.mk --- libmikmod-3.3.6/android/jni/Android.mk 1970-01-01 00:00:00.000000000 +0000 +++ libmikmod-3.3.7/android/jni/Android.mk 2014-06-17 17:02:00.000000000 +0000 @@ -0,0 +1,58 @@ +LOCAL_PATH := $(call my-dir)/.. + +include $(CLEAR_VARS) + +LOCAL_MODULE := mikmod + +MIKMOD_PATH := $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(MIKMOD_PATH)/include +LOCAL_LDLIBS += -lOpenSLES +LOCAL_CFLAGS := -DMIKMOD_BUILD -DHAVE_CONFIG_H -Wall +# enable visibility attributes: +LOCAL_CFLAGS += -fvisibility=hidden -DSYM_VISIBILITY +LOCAL_CFLAGS += -O2 +#LOCAL_CFLAGS += -Os + +LOCAL_SRC_FILES := \ +$(MIKMOD_PATH)/drivers/drv_nos.c \ +$(MIKMOD_PATH)/drivers/drv_osles.c \ +$(MIKMOD_PATH)/loaders/load_669.c \ +$(MIKMOD_PATH)/loaders/load_amf.c \ +$(MIKMOD_PATH)/loaders/load_asy.c \ +$(MIKMOD_PATH)/loaders/load_dsm.c \ +$(MIKMOD_PATH)/loaders/load_far.c \ +$(MIKMOD_PATH)/loaders/load_gdm.c \ +$(MIKMOD_PATH)/loaders/load_gt2.c \ +$(MIKMOD_PATH)/loaders/load_imf.c \ +$(MIKMOD_PATH)/loaders/load_it.c \ +$(MIKMOD_PATH)/loaders/load_m15.c \ +$(MIKMOD_PATH)/loaders/load_med.c \ +$(MIKMOD_PATH)/loaders/load_mod.c \ +$(MIKMOD_PATH)/loaders/load_mtm.c \ +$(MIKMOD_PATH)/loaders/load_okt.c \ +$(MIKMOD_PATH)/loaders/load_s3m.c \ +$(MIKMOD_PATH)/loaders/load_stm.c \ +$(MIKMOD_PATH)/loaders/load_stx.c \ +$(MIKMOD_PATH)/loaders/load_ult.c \ +$(MIKMOD_PATH)/loaders/load_umx.c \ +$(MIKMOD_PATH)/loaders/load_uni.c \ +$(MIKMOD_PATH)/loaders/load_xm.c \ +$(MIKMOD_PATH)/mmio/mmalloc.c \ +$(MIKMOD_PATH)/mmio/mmerror.c \ +$(MIKMOD_PATH)/mmio/mmio.c \ +$(MIKMOD_PATH)/playercode/mdreg.c \ +$(MIKMOD_PATH)/playercode/mdriver.c \ +$(MIKMOD_PATH)/playercode/mdulaw.c \ +$(MIKMOD_PATH)/playercode/mloader.c \ +$(MIKMOD_PATH)/playercode/mlreg.c \ +$(MIKMOD_PATH)/playercode/mlutil.c \ +$(MIKMOD_PATH)/playercode/mplayer.c \ +$(MIKMOD_PATH)/playercode/munitrk.c \ +$(MIKMOD_PATH)/playercode/mwav.c \ +$(MIKMOD_PATH)/playercode/npertab.c \ +$(MIKMOD_PATH)/playercode/sloader.c \ +$(MIKMOD_PATH)/playercode/virtch.c \ +$(MIKMOD_PATH)/playercode/virtch2.c \ +$(MIKMOD_PATH)/playercode/virtch_common.c + +include $(BUILD_SHARED_LIBRARY) diff -Nru libmikmod-3.3.6/android/jni/Application.mk libmikmod-3.3.7/android/jni/Application.mk --- libmikmod-3.3.6/android/jni/Application.mk 1970-01-01 00:00:00.000000000 +0000 +++ libmikmod-3.3.7/android/jni/Application.mk 2014-06-16 07:00:00.000000000 +0000 @@ -0,0 +1,3 @@ +APP_PLATFORM := android-9 +APP_ABI := armeabi armeabi-v7a + diff -Nru libmikmod-3.3.6/android/README libmikmod-3.3.7/android/README --- libmikmod-3.3.6/android/README 1970-01-01 00:00:00.000000000 +0000 +++ libmikmod-3.3.7/android/README 2014-06-17 07:55:50.000000000 +0000 @@ -0,0 +1,20 @@ +- libmikmod for Android: + +Building: To compile the Android version, the Android NDK must be +installed on your machine. If so, type the 'ndk-build' command in +command line. The compiled shared Android libraries for ARM and +ARMv7-A architectures are placed to the generated libs directory. +If necessary, edit config.h and jni/Android.mk to modify compiler +flags and customize the build. + +The compiled libraries do not provide a JNI interface for Java +applications, because the primary intention is (just) to use +the libmikmod in native code as a shared library. +For the JNI wrapper see the old libmikmod-android project: +http://github.com/0xD34D/libmikmod-android + +The aforementioned project was also the source of the used +OpenSL ES driver modified for recent versions of libmikmod. + +Radovan Cervenka + diff -Nru libmikmod-3.3.6/AUTHORS libmikmod-3.3.7/AUTHORS --- libmikmod-3.3.6/AUTHORS 2013-10-03 08:33:15.000000000 +0000 +++ libmikmod-3.3.7/AUTHORS 2014-07-15 07:50:00.000000000 +0000 @@ -100,6 +100,20 @@ * Paul Spark created the SDL windows driver and made changes to build with MSVC++ 6. +Contributors on the Android side +-------------------------------- + +* Radovan Cervenka + provided the Android building artifacts and ported the old OpenSL ES + driver from the old http://github.com/0xD34D/libmikmod-android project + to libmikmod-3. + +Contributors on the Amiga side +------------------------------ + +* Szilárd Biró + provided the AHI driver. + Contributors on the Dos side ---------------------------- diff -Nru libmikmod-3.3.6/autotools/config.guess libmikmod-3.3.7/autotools/config.guess --- libmikmod-3.3.6/autotools/config.guess 2013-12-21 12:10:00.000000000 +0000 +++ libmikmod-3.3.7/autotools/config.guess 2014-07-28 12:15:08.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-11-29' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1371,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <, 1996 @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2.444.28-053d -package_revision=2.4.2.444.28 +VERSION=2.4.2.444.31-13aa +package_revision=2.4.2.444.31 ## ------ ## @@ -1977,7 +1977,7 @@ # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.2.444.28-053d' +scriptversion='(GNU libtool) 2.4.2.444.31-13aa' # func_echo ARG... @@ -2063,7 +2063,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.2.444.28-053d + version: $progname (GNU libtool) 2.4.2.444.31-13aa automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2482,6 +2482,14 @@ _LTECHO_EOF' } +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file # True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out @@ -2489,8 +2497,7 @@ func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file @@ -2522,7 +2529,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -5428,7 +5436,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -5660,7 +5668,12 @@ EOF cat < does not define. */ #cmakedefine pid_t diff -Nru libmikmod-3.3.6/config.h.in libmikmod-3.3.7/config.h.in --- libmikmod-3.3.6/config.h.in 2014-03-20 20:20:15.000000000 +0000 +++ libmikmod-3.3.7/config.h.in 2014-08-31 07:56:01.000000000 +0000 @@ -13,6 +13,9 @@ /* Define if the DEC AudioFile server driver is compiled */ #undef DRV_AF +/* Define if the Amiga AHI driver is compiled */ +#undef DRV_AHI + /* Define if you want an .aiff file writer driver */ #undef DRV_AIFF @@ -46,6 +49,9 @@ /* Define if the OS/2 MCI driver is compiled */ #undef DRV_OS2 +/* Define if the OpenSL ES driver is compiled */ +#undef DRV_OSLES + /* Define if the Open Sound System driver is compiled */ #undef DRV_OSS @@ -307,5 +313,8 @@ /* Define to `int' if does not define. */ #undef pid_t +/* Define to empty if compiler does not understand the `signed' keyword. */ +#undef signed + /* Define to `unsigned int' if does not define. */ #undef size_t diff -Nru libmikmod-3.3.6/configure libmikmod-3.3.7/configure --- libmikmod-3.3.6/configure 2014-03-20 20:20:14.000000000 +0000 +++ libmikmod-3.3.7/configure 2014-08-31 07:56:01.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libmikmod 3.3.6. +# Generated by GNU Autoconf 2.69 for libmikmod 3.3.7. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -14,7 +14,8 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -158,7 +159,8 @@ # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which @@ -185,7 +187,8 @@ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : else exitcode=1; echo positional parameters were not saved. @@ -205,12 +208,14 @@ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -226,9 +231,11 @@ # Try only shells that exist, to save several forks. as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null +then : break 2 fi fi @@ -237,13 +244,15 @@ as_found=false done $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null +then : CONFIG_SHELL=$SHELL as_have_required=yes fi; } IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -265,7 +274,8 @@ exit 255 fi - if test x$as_have_required = xno; then : + if test x$as_have_required = xno +then : $as_echo "$0: This script requires a shell more modern than all" $as_echo "$0: the shells that I found on your system." if test x${ZSH_VERSION+set} = xset ; then @@ -378,7 +388,8 @@ # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 @@ -395,7 +406,8 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) @@ -587,12 +599,12 @@ # Identity of this package. PACKAGE_NAME='libmikmod' PACKAGE_TARNAME='libmikmod' -PACKAGE_VERSION='3.3.6' -PACKAGE_STRING='libmikmod 3.3.6' +PACKAGE_VERSION='3.3.7' +PACKAGE_STRING='libmikmod 3.3.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' -ac_unique_file="include/mikmod.h.in" +ac_unique_file="include/mikmod_internals.h" ac_config_libobj_dir=posix # Factoring default headers for most tests. ac_includes_default="\ @@ -639,8 +651,9 @@ LIBMIKMOD_MINOR_VERSION LIBMIKMOD_MAJOR_VERSION LIBRARY_LIB -DOES_NOT_HAVE_SIGNED REENTRANT +BUILD_DOCS_FALSE +BUILD_DOCS_TRUE SDL_CONFIG SDL2_CONFIG SDL_LIBS @@ -774,6 +787,7 @@ enable_maintainer_mode enable_af enable_alsa +enable_ahi enable_pulseaudio enable_esd enable_nas @@ -801,6 +815,7 @@ enable_threads enable_simd enable_unix +enable_doc enable_dependency_tracking enable_shared enable_static @@ -1372,7 +1387,7 @@ # 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 libmikmod 3.3.6 to adapt to many kinds of systems. +\`configure' configures libmikmod 3.3.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1461,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libmikmod 3.3.6:";; + short | recursive ) echo "Configuration of libmikmod 3.3.7:";; esac cat <<\_ACEOF @@ -1458,6 +1473,7 @@ (and sometimes confusing) to the casual installer --enable-af include DEC AudioFile server driver [default=no] --enable-alsa Linux only: include ALSA driver [guessed] + --enable-ahi Amiga only: include AHI driver [guessed] --enable-pulseaudio include PulseAudio driver [guessed] --enable-esd include EsounD (Enlightened Sound Daemon) driver [default=no] @@ -1484,7 +1500,7 @@ XAudio2.7 [default=no] --enable-os2 OS/2 only: include the OS/2 MCI driver [guessed] --enable-dart OS/2 (Warp 4) only: include OS/2 direct audio (DART) - [default=no] + [guessed] --enable-sam9407 Linux only: include sam9407 driver [default=no] --enable-ultra Linux only: include Ultra driver [default=no] --enable-dl load alsa, esound and ultra drivers at runtime @@ -1495,6 +1511,7 @@ (Unstable!) [default=no] --enable-unix override the default value of MIKMOD_UNIX in mikmod_internals.h (if you *really* need to.) + --enable-doc Build and install the documentation [default=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1603,7 +1620,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libmikmod configure 3.3.6 +libmikmod configure 3.3.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1642,7 +1659,8 @@ test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 else $as_echo "$as_me: failed program was:" >&5 @@ -1683,7 +1701,8 @@ } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 else $as_echo "$as_me: failed program was:" >&5 @@ -1710,7 +1729,8 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval \${$3+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1718,7 +1738,8 @@ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" else eval "$3=no" @@ -1756,7 +1777,8 @@ test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 else $as_echo "$as_me: failed program was:" >&5 @@ -1771,8 +1793,8 @@ # ac_fn_c_try_run LINENO # ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -1796,7 +1818,8 @@ (eval "$ac_try") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : + test $ac_status = 0; }; } +then : ac_retval=0 else $as_echo "$as_me: program exited with status $ac_status" >&5 @@ -1819,7 +1842,8 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval \${$3+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1856,14 +1880,15 @@ #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" else eval "$3=no" @@ -1887,7 +1912,8 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval \${$3+:} false +then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1895,7 +1921,7 @@ /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -1903,12 +1929,13 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -1916,7 +1943,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : else eval "$3=yes" @@ -1940,10 +1968,12 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : + if eval \${$3+:} false +then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval \${$3+:} false +then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1958,7 +1988,8 @@ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_header_compiler=yes else ac_header_compiler=no @@ -1974,7 +2005,8 @@ /* end confdefs.h. */ #include <$2> _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : ac_header_preproc=yes else ac_header_preproc=no @@ -2006,7 +2038,8 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if eval \${$3+:} false +then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2022,7 +2055,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libmikmod $as_me 3.3.6, which was +It was created by libmikmod $as_me 3.3.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2129,6 +2162,8 @@ # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo @@ -2372,11 +2407,12 @@ LIBMIKMOD_MAJOR_VERSION=3 LIBMIKMOD_MINOR_VERSION=3 -LIBMIKMOD_MICRO_VERSION=6 +LIBMIKMOD_MICRO_VERSION=7 LIBMIKMOD_VERSION=$LIBMIKMOD_MAJOR_VERSION.$LIBMIKMOD_MINOR_VERSION.$LIBMIKMOD_MICRO_VERSION ac_aux_dir= -for ac_dir in autotools "$srcdir"/autotools; do +for ac_dir in autotools "$srcdir"/autotools +do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -2423,7 +2459,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if ${ac_cv_path_install+:} false +then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2600,7 +2637,8 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if ${ac_cv_prog_STRIP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2640,7 +2678,8 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2693,7 +2732,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : + if ${ac_cv_path_mkdir+:} false +then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2744,7 +2784,8 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if ${ac_cv_prog_AWK+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2784,7 +2825,8 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false +then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2842,7 +2884,7 @@ # Define the identity of the package. PACKAGE='libmikmod' - VERSION='3.3.6' + VERSION='3.3.7' cat >>confdefs.h <<_ACEOF @@ -2889,7 +2931,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test "${enable_maintainer_mode+set}" = set +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no @@ -2932,7 +2975,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : +if ${ac_cv_build+:} false +then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2966,7 +3010,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : +if ${ac_cv_host+:} false +then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -3007,6 +3052,7 @@ libmikmod_openbsd=no libmikmod_os2=no libmikmod_djgpp=no +libmikmod_amiga=no case $host_os in mingw*) libmikmod_mingw=yes ;; @@ -3017,6 +3063,8 @@ openbsd*) libmikmod_openbsd=yes ;; emx*) libmikmod_os2=yes;; *djgpp) libmikmod_djgpp=yes ;; + amigaos*|aros*|morphos*) + libmikmod_amiga=yes ;; esac # ============================================================== @@ -3024,6 +3072,7 @@ # ============================================================== libmikmod_driver_af=no +libmikmod_driver_ahi=yes libmikmod_driver_aix=no libmikmod_driver_alsa=yes libmikmod_driver_pulseaudio=yes @@ -3049,6 +3098,8 @@ libmikmod_driver_raw=yes libmikmod_driver_stdout=yes libmikmod_driver_pipe=yes +# ANDROID and DRV_OSLES are not configury-integrated +libmikmod_driver_osles=no libmikmod_dynload=yes libmikmod_dynload_underscores=no @@ -3060,12 +3111,15 @@ libmikmod_unix=default +libmikmod_docs=yes + # ========================= # Configure script options. # ========================= # Check whether --enable-af was given. -if test "${enable_af+set}" = set; then : +if test "${enable_af+set}" = set +then : enableval=$enable_af; if test "$enableval" = "yes" then libmikmod_driver_af=yes @@ -3076,7 +3130,8 @@ # Check whether --enable-alsa was given. -if test "${enable_alsa+set}" = set; then : +if test "${enable_alsa+set}" = set +then : enableval=$enable_alsa; if test "$enableval" = "yes" then libmikmod_driver_alsa=yes @@ -3086,8 +3141,21 @@ fi +# Check whether --enable-ahi was given. +if test "${enable_ahi+set}" = set +then : + enableval=$enable_ahi; if test "$enableval" = "yes" +then + libmikmod_driver_ahi=yes +else + libmikmod_driver_ahi=no +fi +fi + + # Check whether --enable-pulseaudio was given. -if test "${enable_pulseaudio+set}" = set; then : +if test "${enable_pulseaudio+set}" = set +then : enableval=$enable_pulseaudio; if test "$enableval" = "yes" then libmikmod_driver_pulseaudio=yes @@ -3098,7 +3166,8 @@ # Check whether --enable-esd was given. -if test "${enable_esd+set}" = set; then : +if test "${enable_esd+set}" = set +then : enableval=$enable_esd; if test "$enableval" = "yes" then libmikmod_driver_esd=yes @@ -3109,7 +3178,8 @@ # Check whether --enable-nas was given. -if test "${enable_nas+set}" = set; then : +if test "${enable_nas+set}" = set +then : enableval=$enable_nas; if test "$enableval" = "yes" then libmikmod_driver_nas=yes @@ -3120,7 +3190,7 @@ case $host_os in - mingw*|emx*|*djgpp) + mingw*|emx*|*djgpp|amigaos*|aros*|morphos*) # windows, dos, os2 don't need sdl, stdout, or pipe. # so default to disabled, but still user-selectable. libmikmod_driver_pipe=no @@ -3135,7 +3205,8 @@ esac # Check whether --enable-aiff was given. -if test "${enable_aiff+set}" = set; then : +if test "${enable_aiff+set}" = set +then : enableval=$enable_aiff; if test "$enableval" = "yes" then libmikmod_driver_aiff=yes @@ -3146,7 +3217,8 @@ # Check whether --enable-wav was given. -if test "${enable_wav+set}" = set; then : +if test "${enable_wav+set}" = set +then : enableval=$enable_wav; if test "$enableval" = "yes" then libmikmod_driver_wav=yes @@ -3157,7 +3229,8 @@ # Check whether --enable-raw was given. -if test "${enable_raw+set}" = set; then : +if test "${enable_raw+set}" = set +then : enableval=$enable_raw; if test "$enableval" = "yes" then libmikmod_driver_raw=yes @@ -3168,7 +3241,8 @@ # Check whether --enable-stdout was given. -if test "${enable_stdout+set}" = set; then : +if test "${enable_stdout+set}" = set +then : enableval=$enable_stdout; if test "$enableval" = "yes" then libmikmod_driver_stdout=yes @@ -3179,7 +3253,8 @@ # Check whether --enable-pipe was given. -if test "${enable_pipe+set}" = set; then : +if test "${enable_pipe+set}" = set +then : enableval=$enable_pipe; if test "$enableval" = "yes" then libmikmod_driver_pipe=yes @@ -3190,7 +3265,8 @@ # Check whether --enable-sdl was given. -if test "${enable_sdl+set}" = set; then : +if test "${enable_sdl+set}" = set +then : enableval=$enable_sdl; if test "$enableval" = "yes" then libmikmod_driver_sdl=yes @@ -3202,7 +3278,8 @@ try_sdl2=yes # Check whether --enable-sdl2 was given. -if test "${enable_sdl2+set}" = set; then : +if test "${enable_sdl2+set}" = set +then : enableval=$enable_sdl2; if test "$enableval" = "yes" then try_sdl2=yes @@ -3213,7 +3290,8 @@ # Check whether --enable-openal was given. -if test "${enable_openal+set}" = set; then : +if test "${enable_openal+set}" = set +then : enableval=$enable_openal; if test "$enableval" = "yes" then libmikmod_driver_openal=yes @@ -3224,7 +3302,8 @@ # Check whether --enable-oss was given. -if test "${enable_oss+set}" = set; then : +if test "${enable_oss+set}" = set +then : enableval=$enable_oss; if test "$enableval" = "yes" then libmikmod_driver_oss=yes @@ -3235,7 +3314,8 @@ # Check whether --enable-osx was given. -if test "${enable_osx+set}" = set; then : +if test "${enable_osx+set}" = set +then : enableval=$enable_osx; if test "$enableval" = "yes" then libmikmod_driver_osx=yes @@ -3246,7 +3326,8 @@ # Check whether --enable-mac was given. -if test "${enable_mac+set}" = set; then : +if test "${enable_mac+set}" = set +then : enableval=$enable_mac; if test "$enableval" = "yes" then libmikmod_driver_mac=yes @@ -3257,7 +3338,8 @@ # Check whether --enable-win was given. -if test "${enable_win+set}" = set; then : +if test "${enable_win+set}" = set +then : enableval=$enable_win; if test "$enableval" = "yes" then libmikmod_driver_win=yes @@ -3268,7 +3350,8 @@ # Check whether --enable-ds was given. -if test "${enable_ds+set}" = set; then : +if test "${enable_ds+set}" = set +then : enableval=$enable_ds; if test "$enableval" = "yes" then libmikmod_driver_ds=yes @@ -3279,7 +3362,8 @@ # Check whether --enable-xaudio2 was given. -if test "${enable_xaudio2+set}" = set; then : +if test "${enable_xaudio2+set}" = set +then : enableval=$enable_xaudio2; if test "$enableval" = "yes" then libmikmod_driver_xaudio2=yes @@ -3291,7 +3375,8 @@ use_xaudio28=no # Check whether --enable-xaudio28 was given. -if test "${enable_xaudio28+set}" = set; then : +if test "${enable_xaudio28+set}" = set +then : enableval=$enable_xaudio28; if test "$enableval" = "yes" then use_xaudio28=yes @@ -3302,7 +3387,8 @@ # Check whether --enable-os2 was given. -if test "${enable_os2+set}" = set; then : +if test "${enable_os2+set}" = set +then : enableval=$enable_os2; if test "$enableval" = "yes" then libmikmod_driver_os2=yes @@ -3313,7 +3399,8 @@ # Check whether --enable-dart was given. -if test "${enable_dart+set}" = set; then : +if test "${enable_dart+set}" = set +then : enableval=$enable_dart; if test "$enableval" = "yes" then libmikmod_driver_dart=yes @@ -3324,7 +3411,8 @@ # Check whether --enable-sam9407 was given. -if test "${enable_sam9407+set}" = set; then : +if test "${enable_sam9407+set}" = set +then : enableval=$enable_sam9407; if test "$enableval" = "yes" then libmikmod_driver_sam9407=yes @@ -3335,7 +3423,8 @@ # Check whether --enable-ultra was given. -if test "${enable_ultra+set}" = set; then : +if test "${enable_ultra+set}" = set +then : enableval=$enable_ultra; if test "$enableval" = "yes" then libmikmod_driver_ultra=yes @@ -3346,7 +3435,8 @@ # Check whether --enable-dl was given. -if test "${enable_dl+set}" = set; then : +if test "${enable_dl+set}" = set +then : enableval=$enable_dl; if test "$enableval" = "yes" then libmikmod_dynload=yes @@ -3357,7 +3447,8 @@ # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : +if test "${enable_debug+set}" = set +then : enableval=$enable_debug; if test "$enableval" = "yes" then libmikmod_debug=yes @@ -3368,7 +3459,8 @@ # Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then : +if test "${enable_threads+set}" = set +then : enableval=$enable_threads; if test "$enableval" = "yes" then libmikmod_threads=yes @@ -3379,7 +3471,8 @@ # Check whether --enable-simd was given. -if test "${enable_simd+set}" = set; then : +if test "${enable_simd+set}" = set +then : enableval=$enable_simd; if test "$enableval" = "yes" then libmikmod_simd=yes @@ -3390,7 +3483,8 @@ # Check whether --enable-unix was given. -if test "${enable_unix+set}" = set; then : +if test "${enable_unix+set}" = set +then : enableval=$enable_unix; if test "$enableval" = "yes" ;then libmikmod_unix=1 elif test "$enableval" = "no" ;then @@ -3399,6 +3493,17 @@ fi +# Check whether --enable-doc was given. +if test "${enable_doc+set}" = set +then : + enableval=$enable_doc; if test "$enableval" = "yes" ;then + libmikmod_docs=yes +elif test "$enableval" = "no" ;then + libmikmod_docs=no +fi +fi + + # =================== # Check for programs. # =================== @@ -3413,7 +3518,8 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_prog_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3453,7 +3559,8 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if ${ac_cv_prog_ac_ct_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3506,7 +3613,8 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_prog_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3546,7 +3654,8 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_prog_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3605,7 +3714,8 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_prog_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3649,7 +3759,8 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if ${ac_cv_prog_ac_ct_CC+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3735,7 +3846,7 @@ /* end confdefs.h. */ int -main () +main (void) { ; @@ -3774,7 +3885,8 @@ (eval "$ac_link_default") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3810,7 +3922,8 @@ else ac_file='' fi -if test -z "$ac_file"; then : +if test -z "$ac_file" +then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } $as_echo "$as_me: failed program was:" >&5 @@ -3844,7 +3957,8 @@ (eval "$ac_link") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3875,7 +3989,7 @@ /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3889,7 +4003,9 @@ # the compiler is broken, or we cross compile. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 $as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then +if test "$cross_compiling" = maybe && test "x$build" != "x$host"; then + cross_compiling=yes +elif test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -3932,14 +4048,15 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if ${ac_cv_objext+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3957,7 +4074,8 @@ (eval "$ac_compile") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3983,14 +4101,15 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if ${ac_cv_c_compiler_gnu+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4000,7 +4119,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes else ac_compiler_gnu=no @@ -4020,7 +4140,8 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if ${ac_cv_prog_cc_g+:} false +then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4031,14 +4152,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes else CFLAGS="" @@ -4046,14 +4168,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : else ac_c_werror_flag=$ac_save_c_werror_flag @@ -4062,14 +4185,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -4098,7 +4222,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if ${ac_cv_prog_cc_c89+:} false +then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4148,7 +4273,7 @@ int argc; char **argv; int -main () +main (void) { return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; @@ -4159,7 +4284,8 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi rm -f core conftest.err conftest.$ac_objext @@ -4182,7 +4308,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" != xno +then : fi @@ -4236,7 +4363,8 @@ rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test "${enable_dependency_tracking+set}" = set +then : enableval=$enable_dependency_tracking; fi @@ -4259,7 +4387,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if ${am_cv_CC_dependencies_compiler_type+:} false +then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4399,7 +4528,8 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false +then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4436,7 +4566,8 @@ set dummy ${ac_tool_prefix}as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : +if ${ac_cv_prog_AS+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$AS"; then @@ -4476,7 +4607,8 @@ set dummy as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AS+:} false; then : +if ${ac_cv_prog_ac_ct_AS+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then @@ -4528,7 +4660,8 @@ set dummy ${ac_tool_prefix}dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_DLLTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -4568,7 +4701,8 @@ set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -4620,7 +4754,8 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if ${ac_cv_prog_OBJDUMP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4660,7 +4795,8 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4738,8 +4874,8 @@ -macro_version='2.4.2.444.28-053d' -macro_revision='2.4.2.444.28' +macro_version='2.4.2.444.31-13aa' +macro_revision='2.4.2.444.31' @@ -4826,7 +4962,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if ${ac_cv_path_SED+:} false +then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4843,7 +4980,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue @@ -4908,7 +5046,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if ${ac_cv_path_GREP+:} false +then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4919,7 +5058,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep + do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue @@ -4971,7 +5111,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if ${ac_cv_path_EGREP+:} false +then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4985,7 +5126,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep + do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue @@ -5038,7 +5180,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : +if ${ac_cv_path_FGREP+:} false +then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5052,7 +5195,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue @@ -5124,7 +5268,8 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test "${with_gnu_ld+set}" = set +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no @@ -5169,7 +5314,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : +if ${lt_cv_path_LD+:} false +then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5209,7 +5355,8 @@ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : +if ${lt_cv_prog_gnu_ld+:} false +then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5236,7 +5383,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : +if ${lt_cv_path_NM+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5258,8 +5406,13 @@ # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; @@ -5299,7 +5452,8 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : +if ${ac_cv_prog_DUMPBIN+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5343,7 +5497,8 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5415,7 +5570,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : +if ${lt_cv_nm_interface+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -5439,7 +5595,8 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : +if ${lt_cv_sys_max_cmd_len+:} false +then : $as_echo_n "(cached) " >&6 else i=0 @@ -5618,7 +5775,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 $as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : +if ${lt_cv_to_host_file_cmd+:} false +then : $as_echo_n "(cached) " >&6 else case $host in @@ -5665,7 +5823,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : +if ${lt_cv_to_tool_file_cmd+:} false +then : $as_echo_n "(cached) " >&6 else #assume ordinary cross tools, or native build. @@ -5692,7 +5851,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : +if ${lt_cv_ld_reload_flag+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -5733,7 +5893,8 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if ${ac_cv_prog_OBJDUMP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5773,7 +5934,8 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5829,7 +5991,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : +if ${lt_cv_deplibs_check_method+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -6074,7 +6237,8 @@ set dummy ${ac_tool_prefix}dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_DLLTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -6114,7 +6278,8 @@ set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -6171,7 +6336,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 $as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : +if ${lt_cv_sharedlib_from_linklib_cmd+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -6215,7 +6381,8 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if ${ac_cv_prog_AR+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -6259,7 +6426,8 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : +if ${ac_cv_prog_ac_ct_AR+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6323,7 +6491,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 $as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : +if ${lt_cv_ar_at_file+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_ar_at_file=no @@ -6331,14 +6500,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -6384,7 +6554,8 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if ${ac_cv_prog_STRIP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6424,7 +6595,8 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6483,7 +6655,8 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +if ${ac_cv_prog_RANLIB+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6523,7 +6696,8 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6652,7 +6826,8 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : +if ${lt_cv_sys_global_symbol_pipe+:} false +then : $as_echo_n "(cached) " >&6 else @@ -6971,7 +7146,8 @@ $as_echo_n "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test "${with_sysroot+set}" = set +then : withval=$with_sysroot; else with_sysroot=no @@ -7004,8 +7180,77 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false +then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false +then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test "${enable_libtool_lock+set}" = set +then : enableval=$enable_libtool_lock; fi @@ -7185,7 +7430,8 @@ CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : +if ${lt_cv_cc_needs_belf+:} false +then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -7198,14 +7444,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes else lt_cv_cc_needs_belf=no @@ -7272,7 +7519,8 @@ set dummy ${ac_tool_prefix}mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : +if ${ac_cv_prog_MANIFEST_TOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$MANIFEST_TOOL"; then @@ -7312,7 +7560,8 @@ set dummy mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -7362,7 +7611,8 @@ test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : +if ${lt_cv_path_mainfest_tool+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_path_mainfest_tool=no @@ -7392,7 +7642,8 @@ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : +if ${ac_cv_prog_DSYMUTIL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -7432,7 +7683,8 @@ set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -7484,7 +7736,8 @@ set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : +if ${ac_cv_prog_NMEDIT+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -7524,7 +7777,8 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7576,7 +7830,8 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : +if ${ac_cv_prog_LIPO+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7616,7 +7871,8 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7668,7 +7924,8 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : +if ${ac_cv_prog_OTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7708,7 +7965,8 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7760,7 +8018,8 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : +if ${ac_cv_prog_OTOOL64+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7800,7 +8059,8 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false +then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7875,7 +8135,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : +if ${lt_cv_apple_cc_single_mod+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7911,7 +8172,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : +if ${lt_cv_ld_exported_symbols_list+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -7922,14 +8184,15 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes else lt_cv_ld_exported_symbols_list=no @@ -7944,7 +8207,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : +if ${lt_cv_ld_force_load+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -8023,7 +8287,8 @@ CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + if ${ac_cv_prog_CPP+:} false +then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -8047,7 +8312,8 @@ #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : else # Broken: fails on valid input. @@ -8061,7 +8327,8 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue else @@ -8074,7 +8341,8 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi @@ -8106,7 +8374,8 @@ #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : else # Broken: fails on valid input. @@ -8120,7 +8389,8 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue else @@ -8133,7 +8403,8 @@ done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -8151,7 +8422,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if ${ac_cv_header_stdc+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8162,14 +8434,15 @@ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_stdc=yes else ac_cv_header_stdc=no @@ -8184,7 +8457,8 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + $EGREP "memchr" >/dev/null 2>&1 +then : else ac_cv_header_stdc=no @@ -8201,7 +8475,8 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : + $EGREP "free" >/dev/null 2>&1 +then : else ac_cv_header_stdc=no @@ -8212,7 +8487,8 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8232,7 +8508,7 @@ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { int i; for (i = 0; i < 256; i++) @@ -8242,7 +8518,8 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : else ac_cv_header_stdc=no @@ -8268,7 +8545,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8282,7 +8560,8 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -8304,7 +8583,8 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test "${enable_shared+set}" = set +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8335,7 +8615,8 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test "${enable_static+set}" = set +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8367,7 +8648,8 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test "${with_pic+set}" = set +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -8396,7 +8678,8 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test "${enable_fast_install+set}" = set +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8484,7 +8767,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : +if ${lt_cv_objdir+:} false +then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8562,7 +8846,8 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if ${lt_cv_path_MAGIC_CMD+:} false +then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8628,7 +8913,8 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if ${lt_cv_path_MAGIC_CMD+:} false +then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8770,7 +9056,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -9163,7 +9450,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : +if ${lt_cv_prog_compiler_pic+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -9178,7 +9466,8 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : +if ${lt_cv_prog_compiler_pic_works+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -9242,7 +9531,8 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : +if ${lt_cv_prog_compiler_static_works+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9285,7 +9575,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if ${lt_cv_prog_compiler_c_o+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9340,7 +9631,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if ${lt_cv_prog_compiler_c_o+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9915,21 +10207,23 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : + if ${lt_cv_aix_libpath_+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9968,21 +10262,23 @@ if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : + if ${lt_cv_aix_libpath_+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -10238,7 +10534,8 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : +if ${lt_cv_prog_compiler__b+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -10307,7 +10604,8 @@ # This should be the same for all languages, so no per-tag cache variable. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : +if ${lt_cv_irix_exported_symbol+:} false +then : $as_echo_n "(cached) " >&6 else save_LDFLAGS=$LDFLAGS @@ -10316,7 +10614,8 @@ /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes else lt_cv_irix_exported_symbol=no @@ -10617,7 +10916,8 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : +if ${lt_cv_archive_cmds_need_lc+:} false +then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -11327,7 +11627,8 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false +then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -11339,15 +11640,17 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi @@ -11747,7 +12050,8 @@ # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if ${ac_cv_lib_dl_dlopen+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11763,14 +12067,15 @@ #endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes else ac_cv_lib_dl_dlopen=no @@ -11781,7 +12086,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else @@ -11803,12 +12109,14 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : +if ${ac_cv_lib_dld_shl_load+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11824,14 +12132,15 @@ #endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes else ac_cv_lib_dld_shl_load=no @@ -11842,16 +12151,19 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if ${ac_cv_lib_dl_dlopen+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11867,14 +12179,15 @@ #endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes else ac_cv_lib_dl_dlopen=no @@ -11885,12 +12198,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : +if ${ac_cv_lib_svld_dlopen+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11906,14 +12221,15 @@ #endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes else ac_cv_lib_svld_dlopen=no @@ -11924,12 +12240,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : +if ${ac_cv_lib_dld_dld_link+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11945,14 +12263,15 @@ #endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes else ac_cv_lib_dld_dld_link=no @@ -11963,7 +12282,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -12004,7 +12324,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : +if ${lt_cv_dlopen_self+:} false +then : $as_echo_n "(cached) " >&6 else if test yes = "$cross_compiling"; then : @@ -12110,7 +12431,8 @@ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : +if ${lt_cv_dlopen_self_static+:} false +then : $as_echo_n "(cached) " >&6 else if test yes = "$cross_compiling"; then : @@ -12359,27 +12681,6 @@ -# Check if makeinfo support html output. If it doesn't, pretend it's missing -# rather than failing rebuilding the documentation. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if makeinfo supports html output" >&5 -$as_echo_n "checking if makeinfo supports html output... " >&6; } -if ${libmikmod_cv_makeinfo_html+:} false; then : - $as_echo_n "(cached) " >&6 -else - if (makeinfo --help 2>&1 | grep html > /dev/null) 2>/dev/null ; then - libmikmod_cv_makeinfo_html=yes - else - libmikmod_cv_makeinfo_html=no - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libmikmod_cv_makeinfo_html" >&5 -$as_echo "$libmikmod_cv_makeinfo_html" >&6; } -if test $libmikmod_cv_makeinfo_html = no ; then - MAKEINFO="$missing_dir/missing makeinfo" -else - MAKEINFO="$MAKEINFO --no-split" -fi - # ============================================================= # Check for typedefs, structures, and compiler characteristics. # ============================================================= @@ -12387,7 +12688,8 @@ if test $ac_cv_c_compiler_gnu = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 $as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : +if ${ac_cv_prog_gcc_traditional+:} false +then : $as_echo_n "(cached) " >&6 else ac_pattern="Autoconf.*'x'" @@ -12397,7 +12699,8 @@ Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -12412,7 +12715,8 @@ Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes fi rm -f conftest* @@ -12428,14 +12732,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : +if ${ac_cv_c_const+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -12492,7 +12797,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_const=yes else ac_cv_c_const=no @@ -12509,7 +12815,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler understands the signed keyword" >&5 $as_echo_n "checking if compiler understands the signed keyword... " >&6; } -if ${libmikmod_cv_gcc_signed+:} false; then : +if ${libmikmod_cv_gcc_signed+:} false +then : $as_echo_n "(cached) " >&6 else @@ -12523,14 +12830,15 @@ /* end confdefs.h. */ int -main () +main (void) { signed int t = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : libmikmod_cv_gcc_signed=yes else libmikmod_cv_gcc_signed=no @@ -12545,14 +12853,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libmikmod_cv_gcc_signed" >&5 $as_echo "$libmikmod_cv_gcc_signed" >&6; } -if test $libmikmod_cv_gcc_signed = yes; then - DOES_NOT_HAVE_SIGNED="" -else - DOES_NOT_HAVE_SIGNED="#define signed" +if test $libmikmod_cv_gcc_signed = no; then + +$as_echo "#define signed /**/" >>confdefs.h + fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : +if test "x$ac_cv_type_pid_t" = xyes +then : else @@ -12563,7 +12872,8 @@ fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : else @@ -12575,7 +12885,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : +if ${ac_cv_c_bigendian+:} false +then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -12588,7 +12899,8 @@ typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -12621,7 +12933,7 @@ #include int -main () +main (void) { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -12633,7 +12945,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12641,7 +12954,7 @@ #include int -main () +main (void) { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -12651,7 +12964,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes else ac_cv_c_bigendian=no @@ -12667,7 +12981,7 @@ #include int -main () +main (void) { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -12677,14 +12991,15 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { #ifndef _BIG_ENDIAN not big endian @@ -12694,7 +13009,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes else ac_cv_c_bigendian=no @@ -12705,7 +13021,8 @@ fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12726,14 +13043,15 @@ extern int foo; int -main () +main (void) { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -12752,7 +13070,7 @@ /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* Are we little or big endian? From Harbison&Steele. */ @@ -12768,7 +13086,8 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_bigendian=no else ac_cv_c_bigendian=yes @@ -12804,7 +13123,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if ${ac_cv_header_stdc+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12815,14 +13135,15 @@ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_stdc=yes else ac_cv_header_stdc=no @@ -12837,7 +13158,8 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + $EGREP "memchr" >/dev/null 2>&1 +then : else ac_cv_header_stdc=no @@ -12854,7 +13176,8 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : + $EGREP "free" >/dev/null 2>&1 +then : else ac_cv_header_stdc=no @@ -12865,7 +13188,8 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12885,7 +13209,7 @@ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { int i; for (i = 0; i < 256; i++) @@ -12895,7 +13219,8 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : else ac_cv_header_stdc=no @@ -12916,7 +13241,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : +if ${ac_cv_header_sys_wait_h+:} false +then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12931,7 +13257,7 @@ #endif int -main () +main (void) { int s; wait (&s); @@ -12940,7 +13266,8 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes else ac_cv_header_sys_wait_h=no @@ -12959,7 +13286,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -12977,7 +13305,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -12986,7 +13315,8 @@ done ac_fn_c_check_func "$LINENO" "memcmp" "ac_cv_func_memcmp" -if test "x$ac_cv_func_memcmp" = xyes; then : +if test "x$ac_cv_func_memcmp" = xyes +then : $as_echo "#define HAVE_MEMCMP 1" >>confdefs.h else @@ -12999,7 +13329,8 @@ fi ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : +if test "x$ac_cv_func_strcasecmp" = xyes +then : $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h else @@ -13012,7 +13343,8 @@ fi ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = xyes; then : +if test "x$ac_cv_func_strdup" = xyes +then : $as_echo "#define HAVE_STRDUP 1" >>confdefs.h else @@ -13025,7 +13357,8 @@ fi ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" -if test "x$ac_cv_func_strstr" = xyes; then : +if test "x$ac_cv_func_strstr" = xyes +then : $as_echo "#define HAVE_STRSTR 1" >>confdefs.h else @@ -13040,7 +13373,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 $as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : +if ${ac_cv_lib_m_floor+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13056,14 +13390,15 @@ #endif char floor (); int -main () +main (void) { return floor (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_m_floor=yes else ac_cv_lib_m_floor=no @@ -13074,7 +13409,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 $as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes; then : +if test "x$ac_cv_lib_m_floor" = xyes +then : LIBRARY_LIB="-lm $LIBRARY_LIB" fi @@ -13084,7 +13420,8 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "srandom" >/dev/null 2>&1; then : + $EGREP "srandom" >/dev/null 2>&1 +then : $as_echo "#define SRANDOM_IN_MATH_H 1" >>confdefs.h @@ -13111,7 +13448,8 @@ for ac_header in dlfcn.h do : ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -13123,7 +13461,8 @@ if test $ac_cv_header_dlfcn_h = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5 $as_echo_n "checking for dlopen in -lc... " >&6; } -if ${ac_cv_lib_c_dlopen+:} false; then : +if ${ac_cv_lib_c_dlopen+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13139,14 +13478,15 @@ #endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_dlopen=yes else ac_cv_lib_c_dlopen=no @@ -13157,12 +13497,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_dlopen" >&5 $as_echo "$ac_cv_lib_c_dlopen" >&6; } -if test "x$ac_cv_lib_c_dlopen" = xyes; then : +if test "x$ac_cv_lib_c_dlopen" = xyes +then : libmikmod_dynload=sun else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if ${ac_cv_lib_dl_dlopen+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13178,14 +13520,15 @@ #endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes else ac_cv_lib_dl_dlopen=no @@ -13196,7 +13539,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : libmikmod_dynload=sun libmikmod_dllib="-ldl" else @@ -13210,7 +13554,8 @@ for ac_header in dl.h do : ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -if test "x$ac_cv_header_dl_h" = xyes; then : +if test "x$ac_cv_header_dl_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_DL_H 1 _ACEOF @@ -13223,7 +13568,8 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : +if ${ac_cv_lib_dld_shl_load+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13239,14 +13585,15 @@ #endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes else ac_cv_lib_dld_shl_load=no @@ -13257,7 +13604,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : libmikmod_dynload=hp libmikmod_dllib="-ldld" CFLAGS="${CFLAGS} -DMIKMOD_DLAPI_HP=1 -I${srcdir}/dlapi" @@ -13273,7 +13621,8 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: checking wherever dynamically loaded symbols need underscores" >&5 $as_echo_n "checking wherever dynamically loaded symbols need underscores... " >&6; } -if ${libmikmod_cv_dynload_underscores+:} false; then : +if ${libmikmod_cv_dynload_underscores+:} false +then : $as_echo_n "(cached) " >&6 else libmikmod_oldlibs=$LIBS @@ -13285,7 +13634,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : libmikmod_cv_dynload_underscores=no else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13303,7 +13653,8 @@ exit(!printfptr); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : libmikmod_cv_dynload_underscores=yes else libmikmod_cv_dynload_underscores=no @@ -13332,7 +13683,7 @@ # POSIX.4 threads # --------------- -if test $libmikmod_mingw = yes ; then +if test $libmikmod_mingw = yes || test $libmikmod_amiga = yes ; then libmikmod_threads=no fi @@ -13341,7 +13692,8 @@ libmikmod_threads=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler recognizes -pthread" >&5 $as_echo_n "checking if compiler recognizes -pthread... " >&6; } -if ${libmikmod_cv_gcc_pthread+:} false; then : +if ${libmikmod_cv_gcc_pthread+:} false +then : $as_echo_n "(cached) " >&6 else ac_save_CFLAGS=$CFLAGS @@ -13357,14 +13709,15 @@ /* end confdefs.h. */ #include int -main () +main (void) { int p = pthread_create(NULL,NULL,NULL,NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : libmikmod_cv_gcc_pthread=yes else libmikmod_cv_gcc_pthread=no @@ -13390,7 +13743,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if ${ac_cv_lib_pthread_pthread_create+:} false; then : +if ${ac_cv_lib_pthread_pthread_create+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13406,14 +13760,15 @@ #endif char pthread_create (); int -main () +main (void) { return pthread_create (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_pthread_pthread_create=yes else ac_cv_lib_pthread_pthread_create=no @@ -13424,12 +13779,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : +if test "x$ac_cv_lib_pthread_pthread_create" = xyes +then : libmikmod_threads=-lpthread else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 $as_echo_n "checking for pthread_create in -lc_r... " >&6; } -if ${ac_cv_lib_c_r_pthread_create+:} false; then : +if ${ac_cv_lib_c_r_pthread_create+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13445,14 +13802,15 @@ #endif char pthread_create (); int -main () +main (void) { return pthread_create (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_r_pthread_create=yes else ac_cv_lib_c_r_pthread_create=no @@ -13463,7 +13821,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5 $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; } -if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then : +if test "x$ac_cv_lib_c_r_pthread_create" = xyes +then : libmikmod_threads=-lc_r fi @@ -13480,13 +13839,15 @@ for ac_header in alsa/asoundlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_ALSA_ASOUNDLIB_H 1 _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; } -if ${ac_cv_lib_asound_snd_pcm_open+:} false; then : +if ${ac_cv_lib_asound_snd_pcm_open+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13502,14 +13863,15 @@ #endif char snd_pcm_open (); int -main () +main (void) { return snd_pcm_open (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_asound_snd_pcm_open=yes else ac_cv_lib_asound_snd_pcm_open=no @@ -13520,7 +13882,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5 $as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; } -if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then : +if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes +then : libmikmod_driver_alsa=yes fi @@ -13532,6 +13895,13 @@ libmikmod_driver_alsa=no fi +# Amiga audio +# --------------------- +case $host_os in + amigaos*|aros*|morphos*) ;; + *) libmikmod_driver_ahi=no ;; +esac + # pulseaudio # ---------- if test $libmikmod_driver_pulseaudio = yes @@ -13540,13 +13910,15 @@ for ac_header in pulse/simple.h do : ac_fn_c_check_header_mongrel "$LINENO" "pulse/simple.h" "ac_cv_header_pulse_simple_h" "$ac_includes_default" -if test "x$ac_cv_header_pulse_simple_h" = xyes; then : +if test "x$ac_cv_header_pulse_simple_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_PULSE_SIMPLE_H 1 _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_simple_new in -lpulse-simple" >&5 $as_echo_n "checking for pa_simple_new in -lpulse-simple... " >&6; } -if ${ac_cv_lib_pulse_simple_pa_simple_new+:} false; then : +if ${ac_cv_lib_pulse_simple_pa_simple_new+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13562,14 +13934,15 @@ #endif char pa_simple_new (); int -main () +main (void) { return pa_simple_new (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_pulse_simple_pa_simple_new=yes else ac_cv_lib_pulse_simple_pa_simple_new=no @@ -13580,7 +13953,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_simple_pa_simple_new" >&5 $as_echo "$ac_cv_lib_pulse_simple_pa_simple_new" >&6; } -if test "x$ac_cv_lib_pulse_simple_pa_simple_new" = xyes; then : +if test "x$ac_cv_lib_pulse_simple_pa_simple_new" = xyes +then : libmikmod_driver_pulseaudio=yes fi @@ -13599,7 +13973,8 @@ libmikmod_driver_esd=no # Check whether --with-esd-prefix was given. -if test "${with_esd_prefix+set}" = set; then : +if test "${with_esd_prefix+set}" = set +then : withval=$with_esd_prefix; esd_prefix="$withval" else esd_prefix="" @@ -13607,14 +13982,16 @@ # Check whether --with-esd-exec-prefix was given. -if test "${with_esd_exec_prefix+set}" = set; then : +if test "${with_esd_exec_prefix+set}" = set +then : withval=$with_esd_exec_prefix; esd_exec_prefix="$withval" else esd_exec_prefix="" fi # Check whether --enable-esdtest was given. -if test "${enable_esdtest+set}" = set; then : +if test "${enable_esdtest+set}" = set +then : enableval=$enable_esdtest; else enable_esdtest=yes @@ -13638,7 +14015,8 @@ set dummy esd-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ESD_CONFIG+:} false; then : +if ${ac_cv_path_ESD_CONFIG+:} false +then : $as_echo_n "(cached) " >&6 else case $ESD_CONFIG in @@ -13704,7 +14082,8 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" rm -f conf.esdtest - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : echo $ac_n "cross compiling; assumed OK... $ac_c" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13765,7 +14144,8 @@ _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : else no_esd=yes @@ -13817,14 +14197,15 @@ #include int -main () +main (void) { return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" echo "*** version of ESD. If it is not finding ESD, you'll need to set your" @@ -13874,7 +14255,8 @@ # Check whether --with-x was given. -if test "${with_x+set}" = set; then : +if test "${with_x+set}" = set +then : withval=$with_x; fi @@ -13885,7 +14267,8 @@ else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : + *,NONE | NONE,*) if ${ac_cv_have_x+:} false +then : $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. @@ -13977,7 +14360,8 @@ /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # We can compile using X headers with no special include directory. ac_x_includes= else @@ -14001,14 +14385,15 @@ /* end confdefs.h. */ #include int -main () +main (void) { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= @@ -14065,13 +14450,15 @@ for ac_header in audio/audiolib.h do : ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default" -if test "x$ac_cv_header_audio_audiolib_h" = xyes; then : +if test "x$ac_cv_header_audio_audiolib_h" = xyes +then : cat >>confdefs.h <<_ACEOF #define HAVE_AUDIO_AUDIOLIB_H 1 _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuCreateFlow in -laudio" >&5 $as_echo_n "checking for AuCreateFlow in -laudio... " >&6; } -if ${ac_cv_lib_audio_AuCreateFlow+:} false; then : +if ${ac_cv_lib_audio_AuCreateFlow+:} false +then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14087,14 +14474,15 @@ #endif char AuCreateFlow (); int -main () +main (void) { return AuCreateFlow (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_audio_AuCreateFlow=yes else ac_cv_lib_audio_AuCreateFlow=no @@ -14105,7 +14493,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuCreateFlow" >&5 $as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; } -if test "x$ac_cv_lib_audio_AuCreateFlow" = xyes; then : +if test "x$ac_cv_lib_audio_AuCreateFlow" = xyes +then : libmikmod_driver_nas=yes fi @@ -14117,29 +14506,32 @@ if test -n "$ac_x_includes" || test -n "$ac_x_libraries"; then ac_save_CFLAGS=$CFLAGS ac_save_LDFLAGS=$LDFLAGS + ac_save_LIBS=$LIBS test -n "$ac_x_includes" && CFLAGS="$CFLAGS -I$ac_x_includes" test -n "$ac_x_libraries" && LDFLAGS="$LDFLAGS -L$ac_x_libraries" - LDFLAGS="$LDFLAGS -laudio" + LIBS="$LIBS -laudio" { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 locations for NAS" >&5 $as_echo_n "checking X11 locations for NAS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include