diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-08 00:40:11 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-08 00:40:11 +0100 |
| commit | 9043d0680a6e15ab0058e8cabc48610de50cc29a (patch) | |
| tree | fbd816acdde66a385411120a44a1af9f479cdca5 /include | |
| parent | 73c6bfed31352563e976fe5bac6e218c74f99e6a (diff) | |
| download | xine-lib-9043d0680a6e15ab0058e8cabc48610de50cc29a.tar.gz xine-lib-9043d0680a6e15ab0058e8cabc48610de50cc29a.tar.bz2 | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 | ||||
| -rw-r--r-- | include/config.h | 23 |
2 files changed, 26 insertions, 1 deletions
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" |