openal32: Remove dll.

configure

@@ -743,7 +743,6 @@ LIBWINE_SHAREDLIB
 METAL_LIBS
 CARBON_LIBS
 OPENCL_LIBS
-OPENAL_LIBS
 COREAUDIO_LIBS
 SECURITY_LIBS
 DISKARBITRATION_LIBS
@@ -925,7 +924,6 @@ with_krb5
 with_ldap
 with_mingw
 with_netapi
-with_openal
 with_opencl
 with_opengl
 with_osmesa
@@ -1319,7 +1317,6 @@ enable_olepro32
 enable_olesvr32
 enable_olethk32
 enable_opcservices
-enable_openal32
 enable_opencl
 enable_opengl32
 enable_packager
@@ -2433,7 +2430,6 @@ Optional Packages:
   --without-ldap          do not use LDAP
   --without-mingw         do not use the MinGW cross-compiler
   --without-netapi        do not use the Samba NetAPI library
-  --without-openal        do not use OpenAL
   --without-opencl        do not use OpenCL
   --without-opengl        do not use OpenGL
   --without-osmesa        do not use the OSMesa library
@@ -4305,13 +4301,6 @@ then :
 fi
 
 
-# Check whether --with-openal was given.
-if test ${with_openal+y}
-then :
-  withval=$with_openal; if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi
-fi
-
-
 # Check whether --with-opencl was given.
 if test ${with_opencl+y}
 then :
@@ -7906,12 +7895,6 @@ then :
   printf "%s\n" "#define HAVE_IOKIT_HID_IOHIDLIB_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "OpenAL/al.h" "ac_cv_header_OpenAL_al_h" "$ac_includes_default"
-if test "x$ac_cv_header_OpenAL_al_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENAL_AL_H 1" >>confdefs.h
-
-fi
 ac_fn_c_check_header_compile "$LINENO" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default"
 if test "x$ac_cv_header_OpenCL_opencl_h" = xyes
 then :
@@ -9989,15 +9972,6 @@ fi
 
         enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes}
     fi
-    if test "$ac_cv_header_OpenAL_al_h" = "yes"
-    then
-        OPENAL_LIBS="-framework OpenAL"
-
-
-printf "%s\n" "#define HAVE_OPENAL 1" >>confdefs.h
-
-        ac_cv_lib_openal=yes
-    fi
     if test "$ac_cv_header_OpenCL_opencl_h" = "yes"
     then
         OPENCL_LIBS="-framework OpenCL"
@@ -18160,79 +18134,6 @@ esac
 
 fi
 
-if test "$ac_cv_header_AL_al_h" = "yes"
-then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lopenal" >&5
-printf %s "checking for -lopenal... " >&6; }
-if test ${ac_cv_lib_soname_openal+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_soname_save_LIBS=$LIBS
-LIBS="-lopenal  $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char alGetSource3i ();
-int
-main (void)
-{
-return alGetSource3i ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  case "$LIBEXT" in
-    dll) ac_cv_lib_soname_openal=`$ac_cv_path_LDD conftest.exe | grep "openal" | sed -e "s/dll.*/dll/"';2,$d'` ;;
-    dylib) ac_cv_lib_soname_openal=`$OTOOL -L conftest$ac_exeext | grep "libopenal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libopenal\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_openal=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libopenal\\.$LIBEXT" | sed -e "s/^.*\\[\\(libopenal\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
-       if ${ac_cv_lib_soname_openal:+false} :
-then :
-  ac_cv_lib_soname_openal=`$LDD conftest$ac_exeext | grep "libopenal\\.$LIBEXT" | sed -e "s/^.*\(libopenal\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
-fi ;;
-  esac
-else $as_nop
-  ac_cv_lib_soname_openal=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  LIBS=$ac_check_soname_save_LIBS
-fi
-if ${ac_cv_lib_soname_openal:+false} :
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
-
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_openal" >&5
-printf "%s\n" "$ac_cv_lib_soname_openal" >&6; }
-
-printf "%s\n" "#define SONAME_LIBOPENAL \"$ac_cv_lib_soname_openal\"" >>confdefs.h
-
-       OPENAL_LIBS="-lopenal"
-
-                      ac_cv_lib_openal=yes
-
-printf "%s\n" "#define HAVE_OPENAL 1" >>confdefs.h
-
-fi
-fi
-if test "x$ac_cv_lib_openal" != xyes
-then :
-  case "x$with_openal" in
-  x)   as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported." ;;
-  xno) ;;
-  *)   as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.
-This is an error since --with-openal was requested." "$LINENO" 5 ;;
-esac
-enable_openal32=${enable_openal32:-no}
-fi
-
 if test "$ac_cv_header_libprocstat_h" = "yes"
 then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for procstat_open_sysctl in -lprocstat" >&5
@@ -21889,7 +21790,6 @@ wine_fn_config_makefile dlls/olesvr32 enable_olesvr32
 wine_fn_config_makefile dlls/olethk32 enable_olethk32
 wine_fn_config_makefile dlls/opcservices enable_opcservices
 wine_fn_config_makefile dlls/opcservices/tests enable_tests
-wine_fn_config_makefile dlls/openal32 enable_openal32
 wine_fn_config_makefile dlls/opencl enable_opencl
 wine_fn_config_makefile dlls/opengl32 enable_opengl32
 wine_fn_config_makefile dlls/opengl32/tests enable_tests
@@ -23388,7 +23288,6 @@ SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS
 DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS
 SECURITY_LIBS = $SECURITY_LIBS
 COREAUDIO_LIBS = $COREAUDIO_LIBS
-OPENAL_LIBS = $OPENAL_LIBS
 OPENCL_LIBS = $OPENCL_LIBS
 CARBON_LIBS = $CARBON_LIBS
 METAL_LIBS = $METAL_LIBS

configure.ac

@@ -46,8 +46,6 @@ AC_ARG_WITH(ldap,      AS_HELP_STRING([--without-ldap],[do not use LDAP]),
             [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi])
 AC_ARG_WITH(mingw,     AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler]))
 AC_ARG_WITH(netapi,    AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library]))
-AC_ARG_WITH(openal,    AS_HELP_STRING([--without-openal],[do not use OpenAL]),
-            [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi])
 AC_ARG_WITH(opencl,    AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
             [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
 AC_ARG_WITH(opengl,    AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
@@ -419,7 +417,6 @@ AC_CHECK_HEADERS(\
 	EGL/egl.h \
 	IOKit/IOKitLib.h \
 	IOKit/hid/IOHIDLib.h \
-	OpenAL/al.h \
 	OpenCL/opencl.h \
 	Security/Security.h \
 	SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \
@@ -734,12 +731,6 @@ case $host_os in
         AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI")
         enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes}
     fi
-    if test "$ac_cv_header_OpenAL_al_h" = "yes"
-    then
-        AC_SUBST(OPENAL_LIBS,"-framework OpenAL")
-        AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])
-        ac_cv_lib_openal=yes
-    fi
     if test "$ac_cv_header_OpenCL_opencl_h" = "yes"
     then
         AC_SUBST(OPENCL_LIBS,"-framework OpenCL")
@@ -1810,17 +1801,6 @@ fi
 WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"],
                  [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.])
 
-dnl **** Check for OpenAL 1.1 ****
-if test "$ac_cv_header_AL_al_h" = "yes"
-then
-    WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(OPENAL_LIBS,"-lopenal")
-                      ac_cv_lib_openal=yes
-                      AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,)
-fi
-WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
-                 [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.],
-                 [enable_openal32])
-
 dnl **** Check for libprocstat ****
 if test "$ac_cv_header_libprocstat_h" = "yes"
 then
@@ -2982,7 +2962,6 @@ WINE_CONFIG_MAKEFILE(dlls/olesvr32)
 WINE_CONFIG_MAKEFILE(dlls/olethk32)
 WINE_CONFIG_MAKEFILE(dlls/opcservices)
 WINE_CONFIG_MAKEFILE(dlls/opcservices/tests)
-WINE_CONFIG_MAKEFILE(dlls/openal32)
 WINE_CONFIG_MAKEFILE(dlls/opencl)
 WINE_CONFIG_MAKEFILE(dlls/opengl32)
 WINE_CONFIG_MAKEFILE(dlls/opengl32/tests)

dlls/openal32/Makefile.in

-MODULE    = openal32.dll
-UNIX_LIBS = $(OPENAL_LIBS)
-
-EXTRADLLFLAGS = -Wb,--prefer-native -mcygwin
-
-C_SRCS = \
-	openal.c

dlls/openal32/openal32.spec

-#OpenAL ALC_1_0
-@ cdecl alcCreateContext(ptr ptr) wine_alcCreateContext
-@ cdecl alcMakeContextCurrent(ptr) wine_alcMakeContextCurrent
-@ cdecl alcProcessContext(ptr) wine_alcProcessContext
-@ cdecl alcSuspendContext(ptr) wine_alcSuspendContext
-@ cdecl alcDestroyContext(ptr) wine_alcDestroyContext
-@ cdecl alcGetCurrentContext() wine_alcGetCurrentContext
-@ cdecl alcGetContextsDevice(ptr) wine_alcGetContextsDevice
-@ cdecl alcOpenDevice(str) wine_alcOpenDevice
-@ cdecl alcCloseDevice(ptr) wine_alcCloseDevice
-@ cdecl alcGetError(ptr) wine_alcGetError
-@ cdecl alcIsExtensionPresent(ptr str) wine_alcIsExtensionPresent
-@ cdecl alcGetProcAddress(ptr str) wine_alcGetProcAddress
-@ cdecl alcGetEnumValue(ptr str) wine_alcGetEnumValue
-@ cdecl alcGetString(ptr long) wine_alcGetString
-@ cdecl alcGetIntegerv(ptr long long ptr) wine_alcGetIntegerv
-#OpenAL AL_1_0
-@ cdecl alEnable(long) wine_alEnable
-@ cdecl alDisable(long) wine_alDisable
-@ cdecl alIsEnabled(long) wine_alIsEnabled
-@ cdecl alGetString(long) wine_alGetString
-@ cdecl alGetBooleanv(long ptr) wine_alGetBooleanv
-@ cdecl alGetIntegerv(long ptr) wine_alGetIntegerv
-@ cdecl alGetFloatv(long ptr) wine_alGetFloatv
-@ cdecl alGetDoublev(long ptr) wine_alGetDoublev
-@ cdecl alGetBoolean(long) wine_alGetBoolean
-@ cdecl alGetInteger(long) wine_alGetInteger
-@ cdecl alGetFloat(long) wine_alGetFloat
-@ cdecl alGetDouble(long) wine_alGetDouble
-@ cdecl alGetError() wine_alGetError
-@ cdecl alIsExtensionPresent(str) wine_alIsExtensionPresent
-@ cdecl alGetProcAddress(str) wine_alGetProcAddress
-@ cdecl alGetEnumValue(str) wine_alGetEnumValue
-@ cdecl alListenerf(long long) wine_alListenerf
-@ cdecl alListener3f(long long long long) wine_alListener3f
-@ cdecl alListenerfv(long ptr) wine_alListenerfv
-@ cdecl alListeneri(long long) wine_alListeneri
-@ cdecl alGetListenerf(long ptr) wine_alGetListenerf
-@ cdecl alGetListener3f(long ptr ptr ptr) wine_alGetListener3f
-@ cdecl alGetListenerfv(long ptr) wine_alGetListenerfv
-@ cdecl alGetListeneri(long ptr) wine_alGetListeneri
-@ cdecl alGetListeneriv(long ptr) wine_alGetListeneriv
-@ cdecl alGenSources(long ptr) wine_alGenSources
-@ cdecl alDeleteSources(long ptr) wine_alDeleteSources
-@ cdecl alIsSource(long) wine_alIsSource
-@ cdecl alSourcef(long long long) wine_alSourcef
-@ cdecl alSource3f(long long long long long) wine_alSource3f
-@ cdecl alSourcefv(long long ptr) wine_alSourcefv
-@ cdecl alSourcei(long long long) wine_alSourcei
-@ cdecl alGetSourcef(long long ptr) wine_alGetSourcef
-@ cdecl alGetSource3f(long long ptr ptr ptr) wine_alGetSource3f
-@ cdecl alGetSourcefv(long long ptr) wine_alGetSourcefv
-@ cdecl alGetSourcei(long long ptr) wine_alGetSourcei
-@ cdecl alGetSourceiv(long long ptr) wine_alGetSourceiv
-@ cdecl alSourcePlayv(long ptr) wine_alSourcePlayv
-@ cdecl alSourceStopv(long ptr) wine_alSourceStopv
-@ cdecl alSourceRewindv(long ptr) wine_alSourceRewindv
-@ cdecl alSourcePausev(long ptr) wine_alSourcePausev
-@ cdecl alSourcePlay(long) wine_alSourcePlay
-@ cdecl alSourceStop(long) wine_alSourceStop
-@ cdecl alSourceRewind(long) wine_alSourceRewind
-@ cdecl alSourcePause(long) wine_alSourcePause
-@ cdecl alSourceQueueBuffers(long long ptr) wine_alSourceQueueBuffers
-@ cdecl alSourceUnqueueBuffers(long long ptr) wine_alSourceUnqueueBuffers
-@ cdecl alGenBuffers(long ptr) wine_alGenBuffers
-@ cdecl alDeleteBuffers(long ptr) wine_alDeleteBuffers
-@ cdecl alIsBuffer(long) wine_alIsBuffer
-@ cdecl alBufferData(long long ptr long long) wine_alBufferData
-@ cdecl alGetBufferf(long long ptr) wine_alGetBufferf
-@ cdecl alGetBufferfv(long long ptr) wine_alGetBufferfv
-@ cdecl alGetBufferi(long long ptr) wine_alGetBufferi
-@ cdecl alGetBufferiv(long long ptr) wine_alGetBufferiv
-@ cdecl alDopplerFactor(long) wine_alDopplerFactor
-@ cdecl alDopplerVelocity(long) wine_alDopplerVelocity
-@ cdecl alDistanceModel(long) wine_alDistanceModel
-#OpenAL ALC_1_1
-@ cdecl alcCaptureOpenDevice(str long long long) wine_alcCaptureOpenDevice
-@ cdecl alcCaptureCloseDevice(ptr) wine_alcCaptureCloseDevice
-@ cdecl alcCaptureStart(ptr) wine_alcCaptureStart
-@ cdecl alcCaptureStop(ptr) wine_alcCaptureStop
-@ cdecl alcCaptureSamples(ptr ptr long) wine_alcCaptureSamples
-#OpenAL AL_1_1
-@ cdecl alListener3i(long long long long) wine_alListener3i
-@ cdecl alListeneriv(long ptr) wine_alListeneriv
-@ cdecl alGetListener3i(long ptr ptr ptr) wine_alGetListener3i
-@ cdecl alSource3i(long long long long long) wine_alSource3i
-@ cdecl alSourceiv(long long ptr) wine_alSourceiv
-@ cdecl alGetSource3i(long long ptr ptr ptr) wine_alGetSource3i
-@ cdecl alBufferf(long long long) wine_alBufferf
-@ cdecl alBuffer3f(long long long long long) wine_alBuffer3f
-@ cdecl alBufferfv(long long ptr) wine_alBufferfv
-@ cdecl alBufferi(long long long) wine_alBufferi
-@ cdecl alBuffer3i(long long long long long) wine_alBuffer3i
-@ cdecl alBufferiv(long long ptr) wine_alBufferiv
-@ cdecl alGetBuffer3f(long long ptr ptr ptr) wine_alGetBuffer3f
-@ cdecl alGetBuffer3i(long long ptr ptr ptr) wine_alGetBuffer3i
-@ cdecl alSpeedOfSound(long) wine_alSpeedOfSound

include/config.h.in

@@ -320,12 +320,6 @@
 /* Define to 1 if you have the <net/route.h> header file. */
 #undef HAVE_NET_ROUTE_H
 
-/* Define to 1 if OpenAL is available */
-#undef HAVE_OPENAL
-
-/* Define to 1 if you have the <OpenAL/al.h> header file. */
-#undef HAVE_OPENAL_AL_H
-
 /* Define to 1 if you have the <OpenCL/opencl.h> header file. */
 #undef HAVE_OPENCL_OPENCL_H
 
@@ -838,9 +832,6 @@
 /* Define to the soname of the libodbc library. */
 #undef SONAME_LIBODBC
 
-/* Define to the soname of the libopenal library. */
-#undef SONAME_LIBOPENAL
-
 /* Define to the soname of the libOSMesa library. */
 #undef SONAME_LIBOSMESA