78 lines
1.9 KiB
Plaintext
78 lines
1.9 KiB
Plaintext
--- configure.orig Mon Jun 19 16:19:25 2000
|
|
+++ configure Wed Jun 21 10:34:30 2000
|
|
@@ -3290,14 +3290,14 @@
|
|
|
|
fi
|
|
if test "x$PTHREAD_LIBS" = xerror; then
|
|
- echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
|
|
-echo "configure:3295: checking for pthread_attr_init in -lc_r" >&5
|
|
+ echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
|
|
+echo "configure:3295: checking for pthread_attr_init in -pthread" >&5
|
|
ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-lc_r $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 3303 "configure"
|
|
#include "confdefs.h"
|
|
@@ -3325,7 +3325,7 @@
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- PTHREAD_LIBS="-lc_r"
|
|
+ PTHREAD_LIBS="-pthread"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
@@ -3927,7 +3927,9 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
-
|
|
+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then
|
|
+ have_esd=no
|
|
+fi
|
|
|
|
if test "x$have_esd" = xyes; then
|
|
HAVE_ESD_TRUE=
|
|
@@ -4208,7 +4210,9 @@
|
|
|
|
rm -f conf.mikmodtest
|
|
|
|
-
|
|
+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then
|
|
+ have_mikmod=no
|
|
+fi
|
|
|
|
if test "x$have_mikmod" = xyes; then
|
|
HAVE_MIKMOD_TRUE=
|
|
@@ -5475,7 +5479,7 @@
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
fi
|
|
rm -f conftest*
|
|
INSTOBJEXT=.mo
|
|
@@ -7113,14 +7117,14 @@
|
|
|
|
if test -n "$GCC"
|
|
then
|
|
- CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math"
|
|
+ CFLAGS="$CFLAGS -fomit-frame-pointer -finline-functions -ffast-math"
|
|
fi
|
|
|
|
arch_type=other
|
|
ARCH_DEFINES=""
|
|
case "$host" in
|
|
i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
|
|
- CFLAGS="$CFLAGS -m486"
|
|
+ CFLAGS="$CFLAGS"
|
|
ARCH_DEFINES="-DI386_ASSEM"
|
|
arch_type=ix86
|
|
;;
|