fixed autoconf and source files to use ASE_HAVE_CONFIG_H

This commit is contained in:
2008-12-13 00:25:48 +00:00
parent d28108c996
commit cdbb0b419d
7 changed files with 196 additions and 77 deletions

View File

@ -11,6 +11,7 @@ CLEANFILES = *dist
install-data-hook:
@"$(GREP)" -E "#define[ ]+ASE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h"
@"$(RM)" -f "$(pkgincludedir)/config.h.in"
@"$(SED)" 's|/\*#define ASE_HAVE_CONFIG_H\*/|#define ASE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h"
uninstall-hook:
@"$(RM)" -f "$(pkgincludedir)/config.h"

View File

@ -554,6 +554,7 @@ uninstall-am: uninstall-pkgincludeHEADERS
install-data-hook:
@"$(GREP)" -E "#define[ ]+ASE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h"
@"$(RM)" -f "$(pkgincludedir)/config.h.in"
@"$(SED)" 's|/\*#define ASE_HAVE_CONFIG_H\*/|#define ASE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h"
uninstall-hook:
@"$(RM)" -f "$(pkgincludedir)/config.h"

View File

@ -1,5 +1,5 @@
/*
* $Id: types.h 468 2008-12-10 10:19:59Z baconevi $
* $Id: types.h 476 2008-12-12 06:25:48Z baconevi $
*
* {License}
*/
@ -17,7 +17,10 @@
******
*/
#if defined(HAVE_CONFIG_H)
/* WARNING: NEVER CHANGE/DELETE THE FOLLOWING LINE */
/*#define ASE_HAVE_CONFIG_H*/
#if defined(ASE_HAVE_CONFIG_H)
#include <ase/config.h>
#elif defined(_WIN32)
#include <ase/conf_msw.h>