diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-20 20:06:04 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-21 09:26:04 -0800 |
| commit | b2e86875d03e349a4c85135e4cf41b26b99b083e (patch) | |
| tree | aa8098a322425576c3c89884adf08fa9f24b0356 | |
| parent | 41bf7992c45c6766c5982b3500b03d9c1b1fab87 (diff) | |
| download | xorg-lib-libXaw-b2e86875d03e349a4c85135e4cf41b26b99b083e.tar.gz | |
convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/XawI18n.h | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index d793ea9..83b20b2 100644 --- a/configure.ac +++ b/configure.ac @@ -90,15 +90,7 @@ AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes]) # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADER(wctype.h, - AC_DEFINE([HAS_WCTYPE_H],1, - [Define to 1 if you have the <wctype.h> header file.])) -AC_CHECK_HEADER(wchar.h, - AC_DEFINE([HAS_WCHAR_H],1, - [Define to 1 if you have the <wchar.h> header file.])) -AC_CHECK_HEADER(widec.h, [], - AC_DEFINE([NO_WIDEC_H],1, - [Define to 1 if you DO NOT have the <widec.h> header file.])) +AC_CHECK_HEADERS([wctype.h wchar.h widec.h]) # Checks for functions AC_CHECK_FUNCS([iswalnum]) diff --git a/src/XawI18n.h b/src/XawI18n.h index 09ab51b..d50171c 100644 --- a/src/XawI18n.h +++ b/src/XawI18n.h @@ -24,9 +24,9 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -#ifdef HAS_WCTYPE_H +#ifdef HAVE_WCTYPE_H #include <wctype.h> -#ifndef NO_WIDEC_H +#ifdef HAVE_WIDEC_H #include <widec.h> #define wcslen(c) wslen(c) #define wcscpy(d, s) wscpy(d, s) @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#ifdef HAS_WCHAR_H +#ifdef HAVE_WCHAR_H #include <wchar.h> #endif |