From 4bd9d28412eb4c60396ec33715dc8ad0ef3541a5 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 3 Jan 2005 20:12:18 +0000 Subject: **BUGFIX** change LT_* variables into XINE_LT_*, because newer versions of libtool claim the whole LT_* namespace for themselves (fixes bug #1094262) CVS patchset: 7321 CVS date: 2005/01/03 20:12:18 --- src/video_out/macosx/Makefile.am | 2 +- src/xine-engine/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index 7ad2f811d..76968ceab 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -15,7 +15,7 @@ libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m # The "-Wl,-framework -Wl,..." is needed for libtool versions before # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) libxineMacOSXVideo_la_LDFLAGS = -version-info \ - $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ -Wl,-framework -Wl,Cocoa -framework Cocoa \ -Wl,-framework -Wl,OpenGL -framework OpenGL libxine_MacOSXVideo_la_OBJCFLAGS = $(OBJCFLAGS) diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 9ae4363ce..af4e06dff 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -40,7 +40,8 @@ libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS) libxine_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) + -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ + $(def_ldflags) include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ -- cgit v1.2.3