From 82776020da7e91e47fd06537e78f55de8ec3efaa Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 8 Aug 2005 11:17:25 +0000 Subject: [PATCH] Removed some unused or redundant configure checks. A few cleanups in configure.ac. --- configure | 794 +----------------------------- configure.ac | 113 +---- dlls/dinput/joystick_linuxinput.c | 3 + dlls/winmm/wineoss/midi.c | 11 + dlls/winmm/wineoss/oss.c | 6 +- dlls/winmm/wineoss/oss.h | 6 +- include/config.h.in | 38 -- 7 files changed, 62 insertions(+), 909 deletions(-) diff --git a/configure b/configure index 9ee72f9eef6..6abb5780789 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -5789,181 +5789,6 @@ _ACEOF fi -for ac_func in iswalnum -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -else - -echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 -echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6 -if test "${ac_cv_lib_w_iswalnum+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lw $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char iswalnum (); -int -main () -{ -iswalnum (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_w_iswalnum=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_w_iswalnum=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 -echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6 -if test $ac_cv_lib_w_iswalnum = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBW 1 -_ACEOF - - LIBS="-lw $LIBS" - -fi - -fi -done - - for ac_func in gethostbyname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -6776,7 +6601,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then fi - +XLIB="" XFILES="" @@ -6787,6 +6612,7 @@ GLU32FILES="" OPENGL_LIBS="" + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -9098,11 +8924,12 @@ else echo "${ECHO_T}no" >&6 fi -if test "$sane_devel" = "no" +SANELIBS="" + +SANEINCL="" + +if test "$sane_devel" != "no" then - SANELIBS="" - SANEINCL="" -else SANELIBS="`$sane_devel --libs`" SANEINCL="`$sane_devel --cflags`" ac_save_CPPFLAGS="$CPPFLAGS" @@ -9330,8 +9157,6 @@ fi CPPFLAGS="$ac_save_CPPFLAGS" fi - - if test "$ac_cv_header_unicode_ubidi_h" = "yes" then saved_libs="$LIBS" @@ -9620,6 +9445,10 @@ fi fi +FREETYPELIBS="" + +FREETYPEINCL="" + echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6 if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then @@ -9691,8 +9520,6 @@ fi if test "$ft_lib" = "no" then - FREETYPELIBS="" - FREETYPEINCL="" wine_cv_msg_freetype=no else # Extract the first word of "freetype-config", so it can be a program name with args. @@ -9776,8 +9603,6 @@ fi fi if test "$ft_devel" = "no" then - FREETYPELIBS="" - FREETYPEINCL="" wine_cv_msg_freetype=yes else FREETYPELIBS=`$ft_devel --libs` @@ -9921,8 +9746,6 @@ _ACEOF fi fi - - if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" then FONTSSUBDIRS="fonts" @@ -10428,158 +10251,6 @@ done LIBS="$ac_save_LIBS" -echo "$as_me:$LINENO: checking for Open Sound System" >&5 -echo $ECHO_N "checking for Open Sound System... $ECHO_C" >&6 -if test "${ac_cv_c_opensoundsystem+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if defined(HAVE_SYS_SOUNDCARD_H) - #include - #elif defined(HAVE_MACHINE_SOUNDCARD_H) - #include - #elif defined(HAVE_SOUNDCARD_H) - #include - #endif - -int -main () -{ - - -/* check for one of the Open Sound System specific SNDCTL_ defines */ -#if !defined(SNDCTL_DSP_STEREO) -#error No open sound system -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_opensoundsystem="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_opensoundsystem="no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_opensoundsystem" >&5 -echo "${ECHO_T}$ac_cv_c_opensoundsystem" >&6 - -if test "$ac_cv_c_opensoundsystem" = "yes" -then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_OSS 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for Open Sound System/MIDI interface" >&5 -echo $ECHO_N "checking for Open Sound System/MIDI interface... $ECHO_C" >&6 -if test "${ac_cv_c_opensoundsystem_midi+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if defined(HAVE_SYS_SOUNDCARD_H) - #include - #elif defined(HAVE_MACHINE_SOUNDCARD_H) - #include - #elif defined(HAVE_SOUNDCARD_H) - #include - #endif - -int -main () -{ - - -/* check for one of the Open Sound System specific SNDCTL_SEQ defines */ -#if !defined(SNDCTL_SEQ_SYNC) -#error No open sound system MIDI interface -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_opensoundsystem_midi="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_opensoundsystem_midi="no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_opensoundsystem_midi" >&5 -echo "${ECHO_T}$ac_cv_c_opensoundsystem_midi" >&6 - -if test "$ac_cv_c_opensoundsystem_midi" = "yes" -then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_OSS_MIDI 1 -_ACEOF - -fi - # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -14322,362 +13993,6 @@ fi -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_working_alloca_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_working_alloca_h=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -if test "${ac_cv_func_alloca_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int -main () -{ -char *p = (char *) alloca (1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_alloca_works=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_alloca_works=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 - -if test $ac_cv_func_alloca_works = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA=alloca.$ac_objext - -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF - - -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi - - done -fi - -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main () -{ - exit (find_stack_direction () < 0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_stack_direction=1 -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 - -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF - - -fi - @@ -16049,74 +15364,6 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether linux/input.h is for real" >&5 -echo $ECHO_N "checking whether linux/input.h is for real... $ECHO_C" >&6 -if test "${wine_cv_linux_input_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - -int -main () -{ - - int foo = EVIOCGBIT(EV_ABS,42); - int bar = BTN_PINKIE; - int fortytwo = 42; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wine_cv_linux_input_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wine_cv_linux_input_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $wine_cv_linux_input_h" >&5 -echo "${ECHO_T}$wine_cv_linux_input_h" >&6 - if test "$wine_cv_linux_input_h" = "yes" - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CORRECT_LINUXINPUT_H 1 -_ACEOF - - fi - echo "$as_me:$LINENO: checking for struct ff_effect.direction" >&5 echo $ECHO_N "checking for struct ff_effect.direction... $ECHO_C" >&6 if test "${ac_cv_member_struct_ff_effect_direction+set}" = set; then @@ -19828,10 +19075,10 @@ s,@SANEINCL@,$SANEINCL,;t t s,@ICULIBS@,$ICULIBS,;t t s,@LCMSLIBS@,$LCMSLIBS,;t t s,@LDAPLIBS@,$LDAPLIBS,;t t -s,@ft_devel@,$ft_devel,;t t -s,@ft_devel2@,$ft_devel2,;t t s,@FREETYPELIBS@,$FREETYPELIBS,;t t s,@FREETYPEINCL@,$FREETYPEINCL,;t t +s,@ft_devel@,$ft_devel,;t t +s,@ft_devel2@,$ft_devel2,;t t s,@FONTSSUBDIRS@,$FONTSSUBDIRS,;t t s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t s,@ARTSLIBS@,$ARTSLIBS,;t t @@ -19866,7 +19113,6 @@ s,@SOCKETLIBS@,$SOCKETLIBS,;t t s,@WINE_BINARIES@,$WINE_BINARIES,;t t s,@MAIN_BINARY@,$MAIN_BINARY,;t t s,@LDD@,$LDD,;t t -s,@ALLOCA@,$ALLOCA,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t /@MAKE_RULES@/r $MAKE_RULES @@ -20526,9 +19772,15 @@ then echo "*** enable Wine to use TrueType fonts." fi -if test -z "$ALSALIBS" -a -z "$ARTSC_LIBS" -a -z "$AUDIOIOLIBS" -a \ - -z "$ac_cv_lib_soname_jack" -a -z "$NASLIBS" -a \ - "$ac_cv_c_opensoundsystem" = "no" -a -z "$ESD_LIBS" +if test -z "$ALSALIBS" -a \ + -z "$ARTSC_LIBS" -a \ + -z "$AUDIOIOLIBS" -a \ + -z "$NASLIBS" -a \ + -z "$ESD_LIBS" -a \ + -z "$ac_cv_lib_soname_jack" -a \ + "$ac_cv_header_sys_soundcard_h" != "yes" -a \ + "$ac_cv_header_machine_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes" then echo "*** No sound system was found. Windows applications will be silent." echo "*** The currently supported sound systems are:" diff --git a/configure.ac b/configure.ac index f306111f540..7746154644e 100644 --- a/configure.ac +++ b/configure.ac @@ -141,8 +141,6 @@ dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) dnl Check for -lossaudio for NetBSD AC_CHECK_LIB(ossaudio,_oss_ioctl) -dnl Check for -lw for Solaris -AC_CHECK_FUNCS(iswalnum,,AC_CHECK_LIB(w,iswalnum)) dnl Check for -lnsl for Solaris AC_CHECK_FUNCS(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname)) dnl Check for -lsocket for Solaris @@ -158,15 +156,11 @@ AC_CHECK_LIB(resolv,res_9_init) dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) -AC_SUBST(XLIB) -AC_SUBST(XFILES) -XFILES="" -AC_SUBST(OPENGLFILES) -OPENGLFILES="" -AC_SUBST(GLU32FILES) -GLU32FILES="" -AC_SUBST(OPENGL_LIBS) -OPENGL_LIBS="" +AC_SUBST(XLIB,"") +AC_SUBST(XFILES,"") +AC_SUBST(OPENGLFILES,"") +AC_SUBST(GLU32FILES,"") +AC_SUBST(OPENGL_LIBS,"") dnl **** Check for header files **** @@ -469,11 +463,10 @@ AC_SUBST(CURSESLIBS) dnl **** Check for SANE **** AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) -if test "$sane_devel" = "no" +AC_SUBST(SANELIBS,"") +AC_SUBST(SANEINCL,"") +if test "$sane_devel" != "no" then - SANELIBS="" - SANEINCL="" -else SANELIBS="`$sane_devel --libs`" SANEINCL="`$sane_devel --cflags`" ac_save_CPPFLAGS="$CPPFLAGS" @@ -490,8 +483,6 @@ else LIBS="$ac_save_LIBS" CPPFLAGS="$ac_save_CPPFLAGS" fi -AC_SUBST(SANELIBS) -AC_SUBST(SANEINCL) dnl **** Check for the ICU library **** if test "$ac_cv_header_unicode_ubidi_h" = "yes" @@ -530,11 +521,11 @@ then fi dnl **** Check for FreeType 2 **** +AC_SUBST(FREETYPELIBS,"") +AC_SUBST(FREETYPEINCL,"") AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS) if test "$ft_lib" = "no" then - FREETYPELIBS="" - FREETYPEINCL="" wine_cv_msg_freetype=no else AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no) @@ -548,8 +539,6 @@ else fi if test "$ft_devel" = "no" then - FREETYPELIBS="" - FREETYPEINCL="" wine_cv_msg_freetype=yes else FREETYPELIBS=`$ft_devel --libs` @@ -588,8 +577,6 @@ else fi fi fi -AC_SUBST(FREETYPELIBS) -AC_SUBST(FREETYPEINCL) dnl Only build the fonts dir if we have both freetype and fontforge if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" @@ -667,53 +654,6 @@ AC_CHECK_FUNCS(\ ) LIBS="$ac_save_LIBS" -dnl **** Check for Open Sound System **** -AC_CACHE_CHECK([for Open Sound System], - ac_cv_c_opensoundsystem, - AC_TRY_COMPILE([ - #if defined(HAVE_SYS_SOUNDCARD_H) - #include - #elif defined(HAVE_MACHINE_SOUNDCARD_H) - #include - #elif defined(HAVE_SOUNDCARD_H) - #include - #endif - ],[ - -/* check for one of the Open Sound System specific SNDCTL_ defines */ -#if !defined(SNDCTL_DSP_STEREO) -#error No open sound system -#endif -],ac_cv_c_opensoundsystem="yes",ac_cv_c_opensoundsystem="no")) - -if test "$ac_cv_c_opensoundsystem" = "yes" -then - AC_DEFINE(HAVE_OSS, 1, [Define if you have the Open Sound system]) -fi - -AC_CACHE_CHECK([for Open Sound System/MIDI interface], - ac_cv_c_opensoundsystem_midi, - AC_TRY_COMPILE([ - #if defined(HAVE_SYS_SOUNDCARD_H) - #include - #elif defined(HAVE_MACHINE_SOUNDCARD_H) - #include - #elif defined(HAVE_SOUNDCARD_H) - #include - #endif - ],[ - -/* check for one of the Open Sound System specific SNDCTL_SEQ defines */ -#if !defined(SNDCTL_SEQ_SYNC) -#error No open sound system MIDI interface -#endif -],ac_cv_c_opensoundsystem_midi="yes",ac_cv_c_opensoundsystem_midi="no")) - -if test "$ac_cv_c_opensoundsystem_midi" = "yes" -then - AC_DEFINE(HAVE_OSS_MIDI, 1, [Define if you have the Open Sound system (MIDI interface)]) -fi - dnl **** Check for aRts Sound Server **** AC_PATH_PROG(ARTSCCONFIG, artsc-config) if test x$ARTSCCONFIG != x -a x$ARTSCCONFIG != x'"$ARTSCCONFIG"'; @@ -1128,7 +1068,6 @@ fi dnl **** Check for functions **** -AC_FUNC_ALLOCA() AC_CHECK_FUNCS(\ _lwp_create \ _lwp_self \ @@ -1237,26 +1176,6 @@ AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long, fsblkcnt_t, fs AC_CHECK_TYPES([sigset_t],,,[#include ]) AC_CHECK_TYPES([request_sense],,,[#include ]) -AC_CACHE_CHECK([whether linux/input.h is for real], - wine_cv_linux_input_h, - AC_TRY_COMPILE([ - #include - ] , [ - int foo = EVIOCGBIT(EV_ABS,42); - int bar = BTN_PINKIE; - int fortytwo = 42; - ], - wine_cv_linux_input_h=yes, - wine_cv_linux_input_h=no, - no - ) - ) - if test "$wine_cv_linux_input_h" = "yes" - then - AC_DEFINE(HAVE_CORRECT_LINUXINPUT_H, 1, - [Define if we have linux/input.h AND it contains the INPUT event API]) - fi - AC_CHECK_MEMBERS([struct ff_effect.direction],,, [#ifdef HAVE_LINUX_INPUT_H #include @@ -1801,9 +1720,15 @@ then echo "*** enable Wine to use TrueType fonts." fi -if test -z "$ALSALIBS" -a -z "$ARTSC_LIBS" -a -z "$AUDIOIOLIBS" -a \ - -z "$ac_cv_lib_soname_jack" -a -z "$NASLIBS" -a \ - "$ac_cv_c_opensoundsystem" = "no" -a -z "$ESD_LIBS" +if test -z "$ALSALIBS" -a \ + -z "$ARTSC_LIBS" -a \ + -z "$AUDIOIOLIBS" -a \ + -z "$NASLIBS" -a \ + -z "$ESD_LIBS" -a \ + -z "$ac_cv_lib_soname_jack" -a \ + "$ac_cv_header_sys_soundcard_h" != "yes" -a \ + "$ac_cv_header_machine_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes" then echo "*** No sound system was found. Windows applications will be silent." echo "*** The currently supported sound systems are:" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 33cf9f68586..b5b57e7b113 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -44,6 +44,9 @@ #endif #ifdef HAVE_LINUX_INPUT_H # include +# if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) +# define HAVE_CORRECT_LINUXINPUT_H +# endif #endif #include "wine/debug.h" diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 1fc0371324e..142c6a46c92 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -72,6 +72,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +#ifdef SNDCTL_SEQ_NRMIDIS +#define HAVE_OSS_MIDI +#endif + #ifdef HAVE_OSS_MIDI #define MIDI_SEQ "/dev/sequencer" @@ -1651,6 +1655,13 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } +#else /* HAVE_OSS_MIDI */ + +BOOL OSS_MidiInit(void) +{ + return FALSE; +} + #endif /* HAVE_OSS_MIDI */ /*======================================================================* diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index ba63632ae97..e5742d686b1 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -74,9 +74,7 @@ LONG CALLBACK OSS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, switch(wMsg) { #ifdef HAVE_OSS case DRV_LOAD: OSS_WaveInit(); -#ifdef HAVE_OSS_MIDI - OSS_MidiInit(); -#endif + OSS_MidiInit(); return 1; case DRV_FREE: return 1; case DRV_OPEN: return OSS_drvOpen((LPSTR)dwParam1); @@ -92,5 +90,3 @@ LONG CALLBACK OSS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } } - - diff --git a/dlls/winmm/wineoss/oss.h b/dlls/winmm/wineoss/oss.h index 5334bbec62f..84450eb6ef0 100644 --- a/dlls/winmm/wineoss/oss.h +++ b/dlls/winmm/wineoss/oss.h @@ -33,6 +33,10 @@ #include #endif +/* check for one of the Open Sound System specific SNDCTL_ defines */ +#ifdef SNDCTL_DSP_STEREO +# define HAVE_OSS +#endif + extern LONG OSS_WaveInit(void); extern BOOL OSS_MidiInit(void); - diff --git a/include/config.h.in b/include/config.h.in index 969bfb02383..9218b11b047 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -5,21 +5,6 @@ /* Specifies the compiler flag that forces a short wchar_t */ #undef CC_FLAG_SHORT_WCHAR -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ -#undef C_ALLOCA - -/* Define to 1 if you have `alloca', as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#undef HAVE_ALLOCA_H - /* Define if you have ALSA 1.x including devel headers */ #undef HAVE_ALSA @@ -59,9 +44,6 @@ /* Define to 1 if you have the `connect' function. */ #undef HAVE_CONNECT -/* Define if we have linux/input.h AND it contains the INPUT event API */ -#undef HAVE_CORRECT_LINUXINPUT_H - /* Define to 1 if you have the header file. */ #undef HAVE_CUPS_CUPS_H @@ -233,9 +215,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IO_H -/* Define to 1 if you have the `iswalnum' function. */ -#undef HAVE_ISWALNUM - /* Define to 1 if you have the header file. */ #undef HAVE_JACK_JACK_H @@ -290,9 +269,6 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define to 1 if you have the `w' library (-lw). */ -#undef HAVE_LIBW - /* Define if you have the libxml2 library */ #undef HAVE_LIBXML2 @@ -446,12 +422,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_SSL_H -/* Define if you have the Open Sound system */ -#undef HAVE_OSS - -/* Define if you have the Open Sound system (MIDI interface) */ -#undef HAVE_OSS_MIDI - /* Define to 1 if you have the `pclose' function. */ #undef HAVE_PCLOSE @@ -947,14 +917,6 @@ /* Define to the soname of the libXrender library. */ #undef SONAME_LIBXRENDER -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION - /* Define if the struct statfs is defined by */ #undef STATFS_DEFINED_BY_SYS_MOUNT