X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=1e3a725d41cdd1105e9faca2b112352934e84b6c;hb=95db5344b35ef0d45271614b3dbd0f5a972b68f0;hp=a57548ef9fe2104c0bb36ed01aa5052abcbfcc43;hpb=2d6efe40bce471b6a84649f2bc8ec04671a521f5;p=vlc

diff --git a/configure.ac b/configure.ac
index a57548ef9f..1e3a725d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,7 @@ case "${host_os}" in
     VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
     VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl])
     VLC_ADD_LDFLAGS([access_file],[-lpoll])
-    LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}"
+    LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
     dnl Check for BONE
     if test -f /boot/beos/system/lib/libbind.so; then
         VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
@@ -571,7 +571,7 @@ AC_CHECK_LIB(m,pow,[
   VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
 ])
 AC_CHECK_LIB(m,sqrt,[
-  VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono],[-lm])
+  VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono colorthres],[-lm])
 ])
 AC_CHECK_LIB(m,ceil,[
   VLC_ADD_LDFLAGS([mosaic],[-lm])
@@ -993,17 +993,19 @@ fi
 
 dnl Check for standard plugin linking flags
 dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
-if test "${SYS}" = "beos"; then
-  VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
-else
-  AC_CACHE_CHECK([if \$CC accepts -shared],
-      [ac_cv_ld_plugins],
-      [CFLAGS="${CFLAGS_save} -shared"
-       AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
-  if test "${ac_cv_ld_plugins}" != "no"; then
-    VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
-  fi
-fi
+AS_IF([test "${enable_libtool}" = "no"], [
+  AS_IF([test "${SYS}" = "beos"], [
+    VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
+  ], [
+    AC_CACHE_CHECK([if \$CC accepts -shared],
+          [ac_cv_ld_plugins],
+          [CFLAGS="${CFLAGS_save} -shared"
+         AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+    AS_IF([test "${ac_cv_ld_plugins}" != "no"], [
+      VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
+    ])
+  ])
+])
 
 dnl Check for variadic macros
 AC_CACHE_CHECK([for variadic cpp macros],
@@ -1091,7 +1093,7 @@ VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
 VLC_ADD_PLUGINS([playlist export sgimb nsc xtag])
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify])
+VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorthres])
 VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
 VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
 VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])
@@ -1425,7 +1427,7 @@ then
   VLC_ADD_PLUGINS([packetizer_copy])
 
   VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
-  VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge])
+  VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel])
 #  VLC_ADD_PLUGINS([stream_out_transrate])
   VLC_ADD_PLUGINS([profile_parser])
 
@@ -1501,8 +1503,8 @@ dnl Audioscrobbler plugin
 dnl
 
 AC_ARG_ENABLE(audioscrobbler,
-  [  --enable-audioscrobbler Last.fm submission plugin (default enabled)])
-AS_IF([test "${enable_audioscrobbler}" != "no"], [
+  [  --enable-audioscrobbler Last.fm submission plugin (default disabled)])
+AS_IF([test "${enable_audioscrobbler}" = "yes"], [
         VLC_ADD_PLUGINS([audioscrobbler])
   ])
 
@@ -3592,7 +3594,7 @@ if test "${enable_glx}" != "no" &&
       VLC_ADD_PLUGINS([glx])
       VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
       VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
-   ])
+   ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])])
   CPPFLAGS="${CPPFLAGS_save}"
 fi
 
@@ -5568,7 +5570,6 @@ AC_CONFIG_FILES([
   activex/axvlc.inf
   bindings/Makefile
   bindings/java/Makefile
-  bindings/java/src/Makefile
   bindings/python/Makefile
   doc/Makefile
   intl/Makefile