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.

8 files changed, 33 insertions, 12 deletions

diff --git a/.hgignore b/.hgignore
index 32b62ae30..c9d403171 100644
--- a/.hgignore
+++ b/.hgignore
@@ -17,8 +17,8 @@ config.log
 config.sub
 config.status
 config.status.lineno
-config.h
-config.h.in
+include/configure.h
+include/configure.h.in
 depcomp
 install-sh
 libtool
diff --git a/Makefile.am b/Makefile.am
index 452210c57..0b8d346da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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:
 	-@echo "This command is intended for maintainers to use;"
 	-@echo "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 --git a/configure.ac b/configure.ac
index c57677b72..68e307990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 ---------------------------------------------
@@ -2141,9 +2141,6 @@ AC_CHECK_FUNC(opendir,
     AC_MSG_ERROR([dirent is needed (opendir, readdir, ...)])
   fi])
 
-AH_BOTTOM([/* include internal system specific header */
-#include "os_internal.h"])
-
 
 dnl ---------------------------------------------
 dnl cflags and debug cflags
diff --git a/include/Makefile.am b/include/Makefile.am
index 97d82e063..46a9e2478 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,6 +6,8 @@ endif
 
 include_HEADERS = xine.h
 
+noinst_HEADERS = config.h configure.h
+
 CONFIG_CLEAN_FILES = xine.h $(inttypes_h)
 
 debug:
@@ -20,7 +22,7 @@ mostlyclean-generic:
 maintainer-clean-generic:
 	-@echo "This command is intended for maintainers to use;"
 	-@echo "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 --git a/include/config.h b/include/config.h
new file mode 100644
index 000000000..3cf680b1c
--- /dev/null
+++ b/include/config.h
@@ -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"
diff --git a/lib/os_internal.h b/lib/os_internal.h
index dd48e04f7..5f61fb84d 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <inttypes.h>
+#include "../src/xine-utils/attributes.h"
 
 
 #if defined(WIN32) || defined(__CYGWIN__)
diff --git a/src/libfaad/common.h b/src/libfaad/common.h
index 47832e648..31f07708a 100644
--- a/src/libfaad/common.h
+++ b/src/libfaad/common.h
@@ -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 --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 13c787925..2a7029522 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -45,7 +45,7 @@
 #endif
 
 #ifdef XINE_COMPILE
-# include "config.h"
+# include "configure.h"
 #endif
 
 /* Export protected only for libxine functions */