Don't create Makefile.in in bindings/java/src

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 57c97d3487a28b01c59149da3969b184a3b220f8..1e3a725d41cdd1105e9faca2b112352934e84b6c 100644 (file)
--- 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],
@@ -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