[gentoo-commits] gentoo-x86 commit in games-arcade/emilia-pinball/files: emilia-pinball-0.3.1-libtool.patch

[gentoo-commits] gentoo-x86 commit in games-arcade/emilia-pinball/files: emilia-pinball-0.3.1-libtool.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/05 18:41:15

  Added:                emilia-pinball-0.3.1-libtool.patch
  Log:
  Use system libltdl wrt #252403, thanks to Diego E. 'Flameeyes' Pettenò for reporting.
  (Portage version: 2.2_rc63/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch?rev=1.1&content-type=text/plain

Index: emilia-pinball-0.3.1-libtool.patch
===================================================================
diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
--- pinball-0.3.1.orig/configure.ac	2003-11-21 09:40:18.000000000 +0200
+++ pinball-0.3.1/configure.ac	2010-03-05 20:41:24.000000000 +0200
@@ -14,18 +14,13 @@
 CFLAGS="-g -W -Wall -O2"
 CXXFLAGS="-g -W -Wall -O2"
 
-AC_CONFIG_SUBDIRS(libltdl)
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
-AC_PROG_LIBTOOL
 
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
 
 dnl *******************************************
 dnl PATHS AND DIRS ****************************
diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
--- pinball-0.3.1.orig/Makefile.am	2003-12-10 12:15:35.000000000 +0200
+++ pinball-0.3.1/Makefile.am	2010-03-05 20:36:48.000000000 +0200
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = libltdl addon base data src test
+SUBDIRS = addon base data src test
 
 EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
 
diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
--- pinball-0.3.1.orig/src/Makefile.am	2003-11-20 18:46:17.000000000 +0200
+++ pinball-0.3.1/src/Makefile.am	2010-03-05 20:37:08.000000000 +0200
@@ -7,9 +7,9 @@
 
 pinlib_LIBRARIES = libemilia_pin.a
 
-INCLUDES = -I../base -I../addon @INCLTDL@
+INCLUDES = -I../base -I../addon
 
-pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
 pinball_LDFLAGS = -export-dynamic
 
 pinball_SOURCES = Pinball.cpp
diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am
--- pinball-0.3.1.orig/test/Makefile.am	2003-11-20 18:46:17.000000000 +0200
+++ pinball-0.3.1/test/Makefile.am	2010-03-05 20:36:38.000000000 +0200
@@ -6,8 +6,8 @@
 noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
 dnl noinst_PROGRAMS = unittest
 
-INCLUDES = -I../base -I../addon -I../src @INCLTDL@
-LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
+INCLUDES = -I../base -I../addon -I../src
+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
 
 testlib_LTLIBRARIES = libModuleTest.la