VLCKit.xcodeproj: Update internal pbxproj.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 12fd3109f5b5cc797ca1c5699475cb9e523526d2..b73734fe99853da690d9c8a75922d78506d080e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2488,7 +2488,7 @@ then
      [Define if you have libcdio 0.78.2 or greater installed]),
      [AC_MSG_WARN(CD Reading and information library not found)])
 
-  if test "${enable_vcdinfo}" != "no"
+  if test "${enable_libvcdinfo}" != "no"
   then
     PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
        [have_libvcdinfo=yes],
@@ -2506,8 +2506,8 @@ if test "${enable_vcdx}" = "yes"
 then
   if test "${have_libvcdinfo}" = "yes"
   then
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
     HAVE_VCDX=no
@@ -2523,8 +2523,8 @@ then
   then
     AC_DEFINE(HAVE_VCDX, 1,
     [Define for the VCD plugin using libcdio/libvcdinfo])
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
     VLC_ADD_PLUGIN([vcdx])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])
@@ -5032,12 +5032,7 @@ AC_SUBST(VERSION_REVISION)
 AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-if test "${build_os}" = "cygwin"
-then
-    AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
-else
-    AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure])
-fi
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
 dnl Win32 need s a numerical version_extra.