From 096398425abd7b9695866b8d62ee97d72c728d6c Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 27 Jul 2015 18:09:19 -0700 Subject: [PATCH] Skip some pointless configure checks on OS X --- configure.ac | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 230e2b498..d0b515290 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,10 @@ AC_SUBST([BUILD_DATE]) ################################################### # Check for pthreads and setup variables / compiler ################################################### -ACX_PTHREAD([], [AC_MSG_FAILURE([You must have working pthreads.])]) -CC="$PTHREAD_CC" +AS_IF([test x$build_darwin != xyes], [ + ACX_PTHREAD([], [AC_MSG_FAILURE([You must have working pthreads.])]) + CC="$PTHREAD_CC" +]) ###################### # Check compiler flags @@ -188,12 +190,16 @@ AC_ARG_ENABLE(sanity-checks, ### Required Dependencies ######################### -AC_PATH_XTRA -AS_IF([test x$no_x = xyes && test x$build_darwin != xyes], - [AC_MSG_FAILURE([You must have a working copy of X installed.])]) +AS_IF([test x$build_darwin != xyes], [ + AC_PATH_XTRA + AS_IF([test x$no_x = xyes], + [AC_MSG_FAILURE([You must have a working copy of X installed.])]) -AX_CHECK_GL -AS_IF([test x$no_gl = xyes], [AC_MSG_FAILURE([Aegisub requires GL support.])]) + AX_CHECK_GL + AS_IF([test x$no_gl = xyes], [AC_MSG_FAILURE([Aegisub requires GL support.])]) +], [ + AC_CHECK_HEADERS([OpenGL/gl.h]) +]) AC_SUBST(GL_CFLAGS) AC_SUBST(GL_LIBS)