From 7bbf2e6ce822ca21cfc098b62e182cdd7848e657 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 5 Sep 2009 19:53:18 +0000 Subject: [PATCH] * Add a check and warnming message if X_CFLAGS / X_LIBS isn't set (and a note that you need Imake) * Remove two lines that have been commented for a year * Fix some error message wording. Originally committed to SVN as r3489. --- aegisub/configure.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/aegisub/configure.in b/aegisub/configure.in index 0abdc912d..3096b559a 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -229,9 +229,7 @@ AC_SUBST(BUILD_DATE) ################################################### # Check for pthreads and setup variables / compiler ################################################### -ACX_PTHREAD([], [AC_MSG_FAILURE([aegisub requires pthreads])]) -#LIBS="$PTHREAD_LIBS $LIBS"; -#CFLAGS="$CFLAGS $PTHREAD_CFLAGS"; +ACX_PTHREAD([], [AC_MSG_FAILURE([You must have working pthreads.])]) CC="$PTHREAD_CC"; @@ -262,10 +260,19 @@ if test "$enable_compiler_flags" != "no"; then fi fi + +########################## +# Check for X include/lib. +########################## +AC_PATH_XTRA +if test -z "$X_CFLAGS" || test -z "$X_LIBS"; then + AC_MSG_FAILURE("You must have a working copy of X and Imake installed.") +fi + + ###################################### # Check Headers / Features / Libraries ###################################### -AC_PATH_XTRA AC_HEADER_STDC AC_HEADER_STDBOOL AC_C_CONST