rpms/freealut/devel freealut-openal.patch, NONE, 1.1 freealut.spec, 1.2, 1.3

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/freealut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29689

Modified Files:
	freealut.spec 
Added Files:
	freealut-openal.patch 
Log Message:
- Fix compile with openal


freealut-openal.patch:

--- NEW FILE freealut-openal.patch ---
--- configure.ac.orig	2006-02-05 01:48:05.000000000 +0100
+++ configure.ac	2006-02-05 01:46:52.000000000 +0100
@@ -35,8 +35,11 @@
 
 # Checks for libraries. (not perfect yet)
 AC_SEARCH_LIBS([pthread_self], [pthread])
-AC_SEARCH_LIBS([alGetError], [openal32 openal])
 
+
+PKG_CHECK_MODULES(openal,openal)
+AC_SUBST(openal_CFLAGS)
+AC_SUBST(openal_LIBS)
 ################################################################################
 # Checks for header files.
 ################################################################################
--- examples/Makefile.am.orig	2006-02-05 01:49:09.000000000 +0100
+++ examples/Makefile.am	2006-02-05 01:50:40.000000000 +0100
@@ -1,8 +1,11 @@
+OPENAL_LIBS = @openal_LIBS@
+OPENAL_CFLAGS = @openal_CFLAGS@
+
 # Build, but do not install the following test programs:
 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 <AL/alut.h>.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS)
--- test_suite/Makefile.am.orig	2006-02-05 02:08:56.000000000 +0100
+++ test_suite/Makefile.am	2006-02-05 02:10:13.000000000 +0100
@@ -1,3 +1,6 @@
+OPENAL_LIBS = @openal_LIBS@
+OPENAL_CFLAGS = @openal_CFLAGS@
+
 # The following files should be in our source distribution in addition to the
 # standard ones included by automake itself:
 EXTRA_DIST =			\
@@ -15,10 +18,10 @@
 	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 <AL/alut.h>.
-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.


Index: freealut.spec
===================================================================
RCS file: /cvs/extras/rpms/freealut/devel/freealut.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freealut.spec	5 Feb 2006 00:26:10 -0000	1.2
+++ freealut.spec	5 Feb 2006 01:20:11 -0000	1.3
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://openal.org/
 Source0:        http://openal.org/openal_webstf/downloads/freealut-1.0.0.tar.gz
+Patch0:         freealut-openal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openal-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --disable-static
@@ -61,6 +63,7 @@
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.0-2
 - Add examples to devel doc
+- Fix openal linking
 
 * Sat Feb 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.0.0-1