* Updated ChangeLog.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 48f8041a2ea046b6275ed20761c262d3053fa097..acac87afa160074f761065d34d09ce735621123f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ else
 fi
 
 dnl Gettext stuff
-ALL_LINGUAS="de en_GB fr ja no ru nl pl"
+ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
 
 AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
 AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
@@ -102,6 +102,9 @@ case "x${target_os}" in
     x11_LDFLAGS="${x11_LDFLAGS} -lsocket"
     xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket"
     ;;
+  xsolaris*)
+    SYS=solaris
+    ;;
   xbeos)
     SYS=beos
     save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}"
@@ -716,9 +719,46 @@ then
       fi
     fi
   ])
+  CPPFLAGS="$save_CPPFLAGS"
+fi
+
+dnl
+dnl dvdplay module: check for libdvdplay
+dnl
+AC_ARG_ENABLE(dvdplay,
+[  --enable-dvdplay        dvdplay input module (default disabled)])
+if test "x$enable_dvdplay" != "xno"
+then
+  AC_ARG_WITH(dvdplay, 
+  [    --with-dvdplay=PATH   libdvdplay headers and libraries])
+  if test "x$with_dvdplay" = x
+  then
+    test_LDFLAGS=""
+    test_CFLAGS=""
+  else
+    test_LDFLAGS="-L${with_dvdplay}/lib"
+    test_CFLAGS="-I${with_dvdplay}/include"
+  fi
+  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+  AC_CHECK_HEADERS(dvdplay/dvdplay.h, [
+      PLUGINS="${PLUGINS} dvdplay"
+      dvdplay_LDFLAGS="${dvdplay_LDFLAGS} ${test_LDFLAGS} -ldvdplay -ldvdread"
+      dvdplay_CFLAGS="${dvdplay_CFLAGS} ${test_CFLAGS}"
+    ],[
+    if test "x$enable_dvdplay" != x
+    then
+      if test "x$with_dvdplay" != x
+      then
+        AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h in ${with_dvdplay}/include])
+      else
+        AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h])
+      fi
+    fi
+  ])
   CPPFLAGS="${save_CPPFLAGS}"
 fi
 
+
 dnl
 dnl  libdvbpsi ts demux
 dnl
@@ -834,11 +874,18 @@ dnl  ipv6 plugin - not for QNX yet
 dnl
 if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32"
 then
-  AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"],[
+  have_ipv6=0
+  AC_CHECK_FUNC(inet_pton,[have_ipv6=1],[
     AC_CHECK_LIB(resolv,inet_pton,
-      [PLUGINS="${PLUGINS} ipv6"
+      [have_ipv6=1
        ipv6_LDFLAGS="${ipv6_LDFLAGS} -lresolv"])
   ])
+  AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h)
+  AC_EGREP_HEADER(sockaddr_in6,netinet/in.h,
+    [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=0])
+  if test x$have_ipv6 = x1; then
+    PLUGINS="${PLUGINS} ipv6"
+  fi
 fi
 if test "x${SYS}" = "xmingw32"
 then
@@ -1735,7 +1782,8 @@ then
   then
     MOZILLA=1
     mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
-    mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs `"
+    dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
+    mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`"
   fi
 fi
 
@@ -1787,7 +1835,7 @@ dnl
 dnl  Create the vlc-config script
 dnl
 libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
-for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} @libdir@/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
+for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} ${libdir}/vlc/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
 AC_SUBST(libvlc_LDFLAGS)
 
 dnl 
@@ -1827,6 +1875,7 @@ AC_SUBST(arts_CFLAGS)
 AC_SUBST(chroma_i420_yuy2_mmx_CFLAGS)
 AC_SUBST(dvd_CFLAGS)
 AC_SUBST(dvdread_CFLAGS)
+AC_SUBST(dvdplay_CFLAGS)
 AC_SUBST(mpeg_ts_dvbpsi_CFLAGS)
 AC_SUBST(directx_CFLAGS)
 AC_SUBST(esd_CFLAGS)
@@ -1861,6 +1910,7 @@ AC_SUBST(directx_LDFLAGS)
 AC_SUBST(dsp_LDFLAGS)
 AC_SUBST(dvd_LDFLAGS)
 AC_SUBST(dvdread_LDFLAGS)
+AC_SUBST(dvdplay_LDFLAGS)
 AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS)
 AC_SUBST(esd_LDFLAGS)
 AC_SUBST(familiar_LDFLAGS)