From 3427c32a2aafd49dc3f96e8e886a4c8e60e28830 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 1 Feb 2018 15:55:37 +0900 Subject: [PATCH] Fix build error due to openal changes [Version] 1.1.0-5 [Profile] Common [Issue Type] Build Change-Id: I0626513649332694ff9ed7f562b6c8985f604c0a --- configure.ac | 3 +++ examples/Makefile.am | 4 ++-- packaging/freealut.spec | 3 ++- src/Makefile.am | 4 ++-- test_suite/Makefile.am | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 2b26d6d..564537e 100644 --- a/configure.ac +++ b/configure.ac @@ -206,6 +206,9 @@ if test "x$enable_efence" = xyes; then LIBS=$alut_saved_LIBS]) fi +PKG_CHECK_MODULES(OPENAL, openal) +AC_SUBST(OPENAL_CFLAGS) +AC_SUBST(OPENAL_LIBS) ################################################################################ # Generate output. ################################################################################ diff --git a/examples/Makefile.am b/examples/Makefile.am index 4c99c50..cd3a009 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,7 +2,7 @@ noinst_PROGRAMS = hello_world playfile # We need to link against our *own* libalut. -LDADD = ../src/libalut.la +LDADD = ../src/libalut.la $(OPENAL_LIBS) # Specifying the following path is needed to find . -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS) diff --git a/packaging/freealut.spec b/packaging/freealut.spec index 5da9ffa..4ed75a1 100644 --- a/packaging/freealut.spec +++ b/packaging/freealut.spec @@ -1,7 +1,7 @@ Name: freealut Summary: OpenAL User Toolkit library Version: 1.1.0 -Release: 4 +Release: 5 Group: System/Libraries URL: http://openal.org/ License: LGPL-2.0 @@ -31,6 +31,7 @@ cp %{SOURCE1001} . %build +./autogen.sh %configure --disable-static %__make %{?_smp_mflags} diff --git a/src/Makefile.am b/src/Makefile.am index 8bd9a27..6756d7f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ libalut_la_SOURCES = \ alutWaveform.c # We use sin and floor, so we might need -lm, autoconf takes care of this. -libalut_la_LIBADD = $(LIBM) +libalut_la_LIBADD = $(LIBM) $(OPENAL_LIBS) # The following libtool flag is neccessary for building DLLs on Windows. libalut_la_LDFLAGS = -no-undefined @@ -29,4 +29,4 @@ libalut_la_LDFLAGS = -no-undefined libalut_la_LDFLAGS += -version-info @VERSIONINFO@ # Specifying the following path is needed to find . -libalut_la_CPPFLAGS = -I$(top_srcdir)/include +libalut_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS) diff --git a/test_suite/Makefile.am b/test_suite/Makefile.am index 898e192..b99639c 100644 --- a/test_suite/Makefile.am +++ b/test_suite/Makefile.am @@ -15,10 +15,10 @@ noinst_PROGRAMS = \ test_waveforms # We need to link against our *own* libalut. -LDADD = ../src/libalut.la +LDADD = ../src/libalut.la $(OPENAL_LIBS) # Specifying the following path is needed to find . -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS) # test_retrostuff tests deprecated functions, but we don't want to get compiler # warnings because of that. -- 2.7.4