67 lines
2.3 KiB
Plaintext
67 lines
2.3 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2001/08/14 23:02:58 pvalchev Exp $
|
|
--- configure.orig Tue Aug 14 16:51:14 2001
|
|
+++ configure Tue Aug 14 16:51:15 2001
|
|
@@ -1076,6 +1076,8 @@ else
|
|
YYY_CXXFLAGS="$YYY_CXXFLAGS -Wall -Werror"
|
|
fi
|
|
|
|
+YYY_CXXFLAGS="$CXXFLAGS"
|
|
+
|
|
|
|
|
|
|
|
@@ -1126,7 +1128,7 @@ fi
|
|
# Extract the first word of "sdl-config", so it can be a program name with args.
|
|
set dummy sdl-config; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:1130: checking for $ac_word" >&5
|
|
+echo "configure:1132: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1161,7 +1163,7 @@ fi
|
|
|
|
min_sdl_version=1.0.0
|
|
echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
|
|
-echo "configure:1165: checking for SDL - version >= $min_sdl_version" >&5
|
|
+echo "configure:1167: checking for SDL - version >= $min_sdl_version" >&5
|
|
no_sdl=""
|
|
if test "$SDL_CONFIG" = "no" ; then
|
|
no_sdl=yes
|
|
@@ -1185,7 +1187,7 @@ echo "configure:1165: checking for SDL -
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1189 "configure"
|
|
+#line 1191 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -1246,7 +1248,7 @@ int main (int argc, char *argv[])
|
|
|
|
|
|
EOF
|
|
-if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:1252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -1280,7 +1282,7 @@ fi
|
|
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
|
LIBS="$LIBS $SDL_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1284 "configure"
|
|
+#line 1286 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -1295,7 +1297,7 @@ int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
echo "*** The test program compiled, but did not run. This usually means"
|
|
echo "*** that the run-time linker is not finding SDL or finding the wrong"
|