Merge commit '55bd7dce01db17356b05da966595ff1ae6097e60' into paxed-merge

diff --cc configure.ac
index afeb6f8035c27f78365bdc401e00a9e4031a760f,5b1d3bfd3496a97696c6116756214a4bac4b7f81..ac346ad07ebbdd7da88d0b97b3329bfa528341b3
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -15,9 -15,9 +15,10 @@@ if test -z "$LEX"; the
     AC_MSG_ERROR([lex or flex not found.])
  fi
  
- AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS+=-lpthread])
+ LEXLIBS="$LEXLIB"
  
- LIBS="$LIBS $LEXLIB $PTHREAD_LIBS"
+ AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR([need pthreads])])
++MY_LIBS="$LIBS $LEXLIB $PTHREAD_LIBS"
  
  AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc)
  if test -z "$YACC"; then

diff --cc dgamelaunch.c
Simple merge