# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1181259611 -3600
# Node ID 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42
# Parent f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167
Fix build issues on systems which need our internal asprintf.
config.h is now include/configure.h and no longer #includes os_internals.h.
A new file, include/config.h, #includes both; this breaks a #include loop.
Other files are updated accordingly.
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 .hgignore
--- a/.hgignore Fri Jun 08 00:40:11 2007 +0100
+++ b/.hgignore Thu Jun 07 03:28:12 2007 +0100
@@ -17,8 +17,8 @@ config.sub
config.sub
config.status
config.status.lineno
-config.h
-config.h.in
+include/configure.h
+include/configure.h.in
depcomp
install-sh
libtool
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 Makefile.am
--- a/Makefile.am Fri Jun 08 00:40:11 2007 +0100
+++ b/Makefile.am Thu Jun 07 03:28:12 2007 +0100
@@ -31,8 +31,6 @@ EXTRA_DIST = config.rpath autogen.sh \
CREDITS \
@DEPCOMP@
-noinst_HEADERS = config.h
-
CONFIG_CLEAN_FILES = libtool
docs:
@@ -109,7 +107,7 @@ maintainer-clean-generic:
[EMAIL PROTECTED] "This command is intended for maintainers to use;"
[EMAIL PROTECTED] "it deletes files that may require special tools to
rebuild."
-rm -f Makefile.in configure acinclude.m4 aclocal.m4
- -rm -f config.h.in stamp-h.in ltconfig ltmain.sh
+ -rm -f stamp-h.in ltconfig ltmain.sh
-rm -f config.guess config.sub install-sh missing mkinstalldirs
-rm -f depcomp config.log
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 configure.ac
--- a/configure.ac Fri Jun 08 00:40:11 2007 +0100
+++ b/configure.ac Thu Jun 07 03:28:12 2007 +0100
@@ -100,7 +100,7 @@ AC_CANONICAL_BUILD
test "$host" == "$build" && check_athlon=yes
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([include/configure.h])
dnl ---------------------------------------------
@@ -2140,9 +2140,6 @@ AC_CHECK_FUNC(opendir,
else
AC_MSG_ERROR([dirent is needed (opendir, readdir, ...)])
fi])
-
-AH_BOTTOM([/* include internal system specific header */
-#include "os_internal.h"])
dnl ---------------------------------------------
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 include/Makefile.am
--- a/include/Makefile.am Fri Jun 08 00:40:11 2007 +0100
+++ b/include/Makefile.am Thu Jun 07 03:28:12 2007 +0100
@@ -5,6 +5,8 @@ endif
endif
include_HEADERS = xine.h
+
+noinst_HEADERS = config.h configure.h
CONFIG_CLEAN_FILES = xine.h $(inttypes_h)
@@ -20,7 +22,7 @@ maintainer-clean-generic:
maintainer-clean-generic:
[EMAIL PROTECTED] "This command is intended for maintainers to use;"
[EMAIL PROTECTED] "it deletes files that may require special tools to
rebuild."
- -rm -f Makefile.in
+ -rm -f Makefile.in configure.h.in
install-data-local: install-includeHEADERS
sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 lib/os_internal.h
--- a/lib/os_internal.h Fri Jun 08 00:40:11 2007 +0100
+++ b/lib/os_internal.h Thu Jun 07 03:28:12 2007 +0100
@@ -17,6 +17,7 @@
#endif
#include <inttypes.h>
+#include "../src/xine-utils/attributes.h"
#if defined(WIN32) || defined(__CYGWIN__)
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 src/libfaad/common.h
--- a/src/libfaad/common.h Fri Jun 08 00:40:11 2007 +0100
+++ b/src/libfaad/common.h Thu Jun 07 03:28:12 2007 +0100
@@ -36,7 +36,7 @@ extern "C" {
#define __STRICT_ANSI__
#endif
-#include "../config.h"
+#include "config.h"
#define INLINE __inline
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 src/xine-utils/attributes.h
--- a/src/xine-utils/attributes.h Fri Jun 08 00:40:11 2007 +0100
+++ b/src/xine-utils/attributes.h Thu Jun 07 03:28:12 2007 +0100
@@ -45,7 +45,7 @@
#endif
#ifdef XINE_COMPILE
-# include "config.h"
+# include "configure.h"
#endif
/* Export protected only for libxine functions */
diff -r 09ecd1c6d5b83f10ecd9c88b87d96c3240e94d42 -r
f11f6c31fc90b79f9dfa7c2eee9e2bd141d91167 include/config.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/config.h Thu Jun 07 03:28:12 2007 +0100
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2007 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public Licence as published by the Free
+ * Software Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * xine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public Licence along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ */
+
+#include "configure.h"
+#include "os_internal.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
