* 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.
This commit is contained in:
Amar Takhar 2009-09-05 19:53:18 +00:00
parent c89dcae7fc
commit 7bbf2e6ce8
1 changed files with 11 additions and 4 deletions

View File

@ -229,9 +229,7 @@ AC_SUBST(BUILD_DATE)
################################################### ###################################################
# Check for pthreads and setup variables / compiler # Check for pthreads and setup variables / compiler
################################################### ###################################################
ACX_PTHREAD([], [AC_MSG_FAILURE([aegisub requires pthreads])]) ACX_PTHREAD([], [AC_MSG_FAILURE([You must have working pthreads.])])
#LIBS="$PTHREAD_LIBS $LIBS";
#CFLAGS="$CFLAGS $PTHREAD_CFLAGS";
CC="$PTHREAD_CC"; CC="$PTHREAD_CC";
@ -262,10 +260,19 @@ if test "$enable_compiler_flags" != "no"; then
fi fi
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 # Check Headers / Features / Libraries
###################################### ######################################
AC_PATH_XTRA
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
AC_C_CONST AC_C_CONST