Commit 6c20d552 authored by panne's avatar panne

[project @ 2003-11-01 23:43:13 by panne]

Synched with hugs98 repository again (X_FLAGS handling this time)

Merge to STABLE.
parent f5d11ad4
...@@ -669,7 +669,9 @@ define(<<AC_CV_NAME_supported>>, translit(fptools_cv_htype_sup_$1, [ *], [_p]))d ...@@ -669,7 +669,9 @@ define(<<AC_CV_NAME_supported>>, translit(fptools_cv_htype_sup_$1, [ *], [_p]))d
changequote([, ])dnl changequote([, ])dnl
AC_MSG_CHECKING(Haskell type for $1) AC_MSG_CHECKING(Haskell type for $1)
AC_CACHE_VAL(AC_CV_NAME, AC_CACHE_VAL(AC_CV_NAME,
[AC_CV_NAME_supported=yes; [AC_CV_NAME_supported=yes
fp_check_htype_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_TRY_RUN([#include <stdio.h> AC_TRY_RUN([#include <stdio.h>
#include <stddef.h> #include <stddef.h>
...@@ -744,6 +746,7 @@ main() { ...@@ -744,6 +746,7 @@ main() {
}],AC_CV_NAME=`cat conftestval`, }],AC_CV_NAME=`cat conftestval`,
ifelse([$2], , [AC_CV_NAME=NotReallyAType; AC_CV_NAME_supported=no], AC_CV_NAME=$2), ifelse([$2], , [AC_CV_NAME=NotReallyAType; AC_CV_NAME_supported=no], AC_CV_NAME=$2),
ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], AC_CV_NAME=$3))]) dnl ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], AC_CV_NAME=$3))]) dnl
CPPFLAGS="$fp_check_htype_save_cppflags"
if test "$AC_CV_NAME_supported" = yes; then if test "$AC_CV_NAME_supported" = yes; then
AC_MSG_RESULT($AC_CV_NAME) AC_MSG_RESULT($AC_CV_NAME)
AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1]) AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1])
......
...@@ -861,11 +861,14 @@ dnl ** check for Windows include files ...@@ -861,11 +861,14 @@ dnl ** check for Windows include files
AC_CHECK_HEADERS(windows.h) AC_CHECK_HEADERS(windows.h)
dnl ** check for OpenGL include files dnl ** check for OpenGL include files
fp_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
if test $UseQuartzOpenGL = YES ; then if test $UseQuartzOpenGL = YES ; then
AC_CHECK_HEADERS(OpenGL/gl.h) AC_CHECK_HEADERS(OpenGL/gl.h)
else else
AC_CHECK_HEADERS(GL/gl.h) AC_CHECK_HEADERS(GL/gl.h)
fi fi
CPPFLAGS="$fp_save_cppflags"
dnl ** check if it is safe to include both <time.h> and <sys/time.h> dnl ** check if it is safe to include both <time.h> and <sys/time.h>
AC_HEADER_TIME AC_HEADER_TIME
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment