[vlc-devel] commit: clean up ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jul 30 20:46:31 2009 +0200| [23f4a2aea1195245f3e008f895f7e87c39756f9b] | committer: Felix Paul Kühne 

clean up

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=23f4a2aea1195245f3e008f895f7e87c39756f9b
---

 configure.ac                        |   11 +++--------
 extras/package/macosx/Info.plist.in |    2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 53e6a44..0f5d60c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5065,6 +5065,7 @@ then
   VLC_ADD_LDFLAGS([macosx minimal_macosx],            [-Wl,-framework,AGL])
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,IOKit])
   VLC_ADD_LDFLAGS([macosx],                           [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle])
+  VLC_ADD_OBJCFLAGS([macosx],                         [-F\\\${top_srcdir}/extras/contrib/Sparkle])
   dnl For bug report
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,AddressBook])
   VLC_ADD_LDFLAGS([macosx qtcapture],                 [-Wl,-framework,QTKit])
@@ -5072,19 +5073,13 @@ then
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,WebKit])
   VLC_ADD_LDFLAGS([opengllayer qtcapture],            [-Wl,-framework,QuartzCore])
   VLC_ADD_LDFLAGS([qtcapture],                        [-Wl,-framework,CoreVideo])
-  VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
+  VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
 
   VLC_ADD_PLUGIN([access_eyetv])
   VLC_ADD_PLUGIN([qtcapture])
   VLC_ADD_PLUGIN([macosx])
   VLC_ADD_PLUGIN([minimal_macosx])
-
-  ORIGCFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -x objective-c"
-  AC_TRY_COMPILE([#import <QuartzCore/CALayer.h>],,
-  [VLC_ADD_PLUGIN([opengllayer])
-  VLC_ADD_OBJCFLAGS([opengllayer])],[])
-  CFLAGS=$ORIGCFLAGS
+  VLC_ADD_PLUGIN([opengllayer])
 fi
 
 dnl
diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in
index f24b6eb..1bd9abf 100644
--- a/extras/package/macosx/Info.plist.in
+++ b/extras/package/macosx/Info.plist.in
@@ -1093,7 +1093,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>#REVISION#</string>
+	<string>@VERSION@</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>