Remove OpenAL from makefile/configure

Author: FrodeSolheim

Makefile.am

@@ -12,7 +12,7 @@ CM_CFLAGS += @GLIB_CFLAGS@
 # CM_CFLAGS += @GTK3_CFLAGS@
 CM_CFLAGS += @LUA_CFLAGS@
 CM_CFLAGS += @MIR_CFLAGS@
-CM_CFLAGS += @OPENAL_CFLAGS@
+# CM_CFLAGS += @OPENAL_CFLAGS@
 CM_CFLAGS += @OPENGL_CFLAGS@
 # CM_CFLAGS += @OS_CFLAGS@
 CM_CFLAGS += @PNG_CFLAGS@
@@ -76,7 +76,7 @@ LIBS += @GLIB_LIBS@
 # LIBS += @GTK3_LIBS@
 LIBS += @IOKIT_LIBS@
 # LIBS += @MIR_LIBS@
-LIBS += @OPENAL_LIBS@
+# LIBS += @OPENAL_LIBS@
 LIBS += @OPENGL_LIBS@
 # LIBS += @OS_LIBS@
 LIBS += @PNG_LIBS@
@@ -111,7 +111,7 @@ AM_LDFLAGS += -static
 AM_CPPFLAGS += -DGLEW_STATIC
 AM_CPPFLAGS += -DAL_LIBTYPE_STATIC
 # Hack for OpenAL static missing libcommon.a
-LIBS += ../openal-soft/libcommon.a
+# LIBS += ../openal-soft/libcommon.a
 # One or more .pc files are missing -liconv
 LIBS += -liconv
 endif

configure.ac

@@ -281,29 +281,29 @@ PKG_CHECK_MODULES([MIR], [mirclient], [
 	AC_SUBST([MIR_CFLAGS])
 ])
 
-AC_ARG_WITH(openal, AS_HELP_STRING(
-    [--without-openal], [Disable OpenAL audio usage]))
-AS_IF([test "x$with_openal" != xno], [
-    # AC_SUBST([USE_OPENAL], [1])
-    AC_DEFINE([WITH_OPENAL], [1], [Define to 1 to use OpenAL])
-    PKG_CHECK_MODULES([OPENAL], [openal], [
-    ], [
-          AS_CASE([$host_os],
-          [darwin*], [
-                  AC_MSG_NOTICE([Using OpenAL.framework])
-                  OPENAL_LIBS="-framework OpenAL"
-          ],
-          [
-                  AC_CHECK_LIB([openal], [alcOpenDevice], [
-                          OPENAL_LIBS="-lopenal"
-                  ], [
-                          AC_MSG_FAILURE([OpenAL not found])
-                  ])
-          ])
-          AC_SUBST([OPENAL_CFLAGS])
-          AC_SUBST([OPENAL_LIBS])
-    ])
-])
+# AC_ARG_WITH(openal, AS_HELP_STRING(
+#     [--without-openal], [Disable OpenAL audio usage]))
+# AS_IF([test "x$with_openal" != xno], [
+#     # AC_SUBST([USE_OPENAL], [1])
+#     AC_DEFINE([WITH_OPENAL], [1], [Define to 1 to use OpenAL])
+#     PKG_CHECK_MODULES([OPENAL], [openal], [
+#     ], [
+#           AS_CASE([$host_os],
+#           [darwin*], [
+#                   AC_MSG_NOTICE([Using OpenAL.framework])
+#                   OPENAL_LIBS="-framework OpenAL"
+#           ],
+#           [
+#                   AC_CHECK_LIB([openal], [alcOpenDevice], [
+#                           OPENAL_LIBS="-lopenal"
+#                   ], [
+#                           AC_MSG_FAILURE([OpenAL not found])
+#                   ])
+#           ])
+#           AC_SUBST([OPENAL_CFLAGS])
+#           AC_SUBST([OPENAL_LIBS])
+#     ])
+# ])
 
 # AC_SUBST([USE_OPENGL], [1])
 AC_DEFINE([USE_OPENGL], [1], [Define to 1 to use OpenGL])
@@ -510,8 +510,8 @@ AC_CHECK_HEADERS([locale.h])
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([netdb.h])
 AC_CHECK_HEADERS([netinet/in.h])
-AC_CHECK_HEADERS([OpenAL/al.h])
-AC_CHECK_HEADERS([OpenAL/alc.h])
+# AC_CHECK_HEADERS([OpenAL/al.h])
+# AC_CHECK_HEADERS([OpenAL/alc.h])
 AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([stdlib.h])
@@ -931,8 +931,8 @@ echo "  Module extension:  $LOADABLE_MODULE_EXT"
 echo ""
 echo "  LIBMPEG2_CFLAGS:   $LIBMPEG2_CFLAGS"
 echo "  LIBMPEG2_LIBS:     $LIBMPEG2_LIBS"
-echo "  OPENAL_CFLAGS:     $OPENAL_CFLAGS"
-echo "  OPENAL_LIBS:       $OPENAL_LIBS"
+# echo "  OPENAL_CFLAGS:     $OPENAL_CFLAGS"
+# echo "  OPENAL_LIBS:       $OPENAL_LIBS"
 echo "  OPENGL_CFLAGS:     $OPENGL_CFLAGS"
 echo "  OPENGL_LIBS:       $OPENGL_LIBS"
 echo "  OS_CPPFLAGS:       $OS_CPPFLAGS"