From dbdcb15d3e50484f1349748fe2cbe102320e032b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sun, 12 Dec 2004 13:51:28 +0000
Subject: Check absolute path in $ac_aux_dir (just reflected from gxine).
 Compilation fixes for cross-compiling with MinGW32.

CVS patchset: 7231
CVS date: 2004/12/12 13:51:28
---
 ChangeLog                  |  1 +
 configure.ac               |  5 ++++-
 lib/os_internal.h          |  1 +
 src/input/input_dvd.c      | 12 ++++++------
 src/video_out/alphablend.c |  1 -
 src/xine-utils/xineutils.h | 15 ++++++++++-----
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cd71d93a..116987c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ xine-lib (1-xxx)
   * fixed restoring xv settings on exit for some frontends
   * UTF-8 support for cddb (freedb) client
   * identify AAC, MPEG4 and H264 on transport streams
+  * build fixes and improvements (not using mkinstalldirs, mingw32)
 
 xine-lib (1-rc7)
   * Build system improvements: replacement functions, better work with headers
diff --git a/configure.ac b/configure.ac
index ce6ee86d1..1e6934173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2120,7 +2120,10 @@ dnl ---------------------------------------------
 
 AC_SUBST(mkdir_p)
 if test -n "$ac_aux_dir"; then
-  MKINSTALLDIRS="$ac_aux_dir/install-sh -d"
+  case "$ac_aux_dir" in
+    /*) MKINSTALLDIRS="$ac_aux_dir/install-sh -d" ;;
+    *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/install-sh -d" ;;
+  esac
 else
   MKINSTALLDIRS="\$(top_srcdir)/install-sh -d"
 fi
diff --git a/lib/os_internal.h b/lib/os_internal.h
index 77aa7b4d0..c79448a22 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -35,6 +35,7 @@ char *_xine_private_strtok_r(char *s, const char *delim, char **ptrptr);
 #ifndef HAVE_GETTIMEOFDAY
 #  ifdef WIN32
 #    include <winsock.h>
+struct timezone;
 #  else
 #    include <sys/time.h>
 #  endif
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e848710ef..6dc24c241 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2003 the xine project, 
+ * Copyright (C) 2000-2004 the xine project, 
  *                         Rich Wareham <richwareham@users.sourceforge.net>
  * 
  * This file is part of xine, a free video player.
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.193 2004/12/08 18:24:21 mroi Exp $
+ * $Id: input_dvd.c,v 1.194 2004/12/12 13:51:29 valtri Exp $
  *
  */
 
@@ -41,9 +41,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/param.h>
-#endif /* _MSC_VER */
+#endif /* WIN32 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,13 +56,13 @@
 #include <errno.h>
 #include <dlfcn.h>
 
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/mount.h>
 #include <sys/wait.h>
 
 #include <sys/poll.h>
 #include <sys/ioctl.h>
-#endif /* _MSC_VER */
+#endif /* WIN32 */
 
 
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 1d8980103..48e0bc633 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <inttypes.h>
 
 #include "xine_internal.h"
 #include "video_out.h"
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 21070a1a9..eb4897db1 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineutils.h,v 1.95 2004/10/29 23:11:38 miguelfreitas Exp $
+ * $Id: xineutils.h,v 1.96 2004/12/12 13:51:30 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -27,6 +27,10 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -40,6 +44,11 @@ extern "C" {
 #  include "xine_buffer.h"
 #  include "configfile.h"
 #else
+#  ifdef WIN32
+#    include <winsock.h>
+#  else
+#    include <sys/time.h>
+#  endif
 #  include <xine/os_types.h>
 #  include <xine/attributes.h>
 #  include <xine/compat.h>
@@ -48,10 +57,6 @@ extern "C" {
 #  include <xine/configfile.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 
-- 
cgit v1.2.3