pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed legacy Mac OS X dlcompat code.

Browse source 
It was only needed for Mac OS X 10.0 through 10.2, so it seems silly to keep
 it around for SDL 1.3.

I'll leave it in the 1.2 branch for now, though.
This commit is contained in:
Ryan C. Gordon 2011-09-09 00:34:48 -04:00
parent 5089e0b3d9
commit caedc60d07
6 changed files with 5573 additions and 12978 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Xcode/SDL/SDL.xcodeproj/project.pbxproj
View file

@ -204,7 +204,6 @@
04BD007112E6671800899322 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1712E6671700899322 /* SDL_joystick_c.h */; }; 04BD007112E6671800899322 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1712E6671700899322 /* SDL_joystick_c.h */; };
04BD007212E6671800899322 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; }; 04BD007212E6671800899322 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; };
04BD008812E6671800899322 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3312E6671700899322 /* SDL_sysloadso.c */; }; 04BD008812E6671800899322 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3312E6671700899322 /* SDL_sysloadso.c */; };
04BD008A12E6671800899322 /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3712E6671700899322 /* SDL_dlcompat.c */; };
04BD009412E6671800899322 /* SDL_syspower.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4B12E6671700899322 /* SDL_syspower.c */; }; 04BD009412E6671800899322 /* SDL_syspower.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4B12E6671700899322 /* SDL_syspower.c */; };
04BD009612E6671800899322 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; }; 04BD009612E6671800899322 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; };
04BD009B12E6671800899322 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; }; 04BD009B12E6671800899322 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; };
@ -362,7 +361,6 @@
04BD028C12E6671800899322 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1712E6671700899322 /* SDL_joystick_c.h */; }; 04BD028C12E6671800899322 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1712E6671700899322 /* SDL_joystick_c.h */; };
04BD028D12E6671800899322 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; }; 04BD028D12E6671800899322 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; };
04BD02A312E6671800899322 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3312E6671700899322 /* SDL_sysloadso.c */; }; 04BD02A312E6671800899322 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3312E6671700899322 /* SDL_sysloadso.c */; };
04BD02A512E6671800899322 /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE3712E6671700899322 /* SDL_dlcompat.c */; };
04BD02AE12E6671800899322 /* SDL_syspower.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4B12E6671700899322 /* SDL_syspower.c */; }; 04BD02AE12E6671800899322 /* SDL_syspower.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4B12E6671700899322 /* SDL_syspower.c */; };
04BD02B012E6671800899322 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; }; 04BD02B012E6671800899322 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; };
04BD02B512E6671800899322 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; }; 04BD02B512E6671800899322 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; };
@ -692,7 +690,6 @@
04BDFE1712E6671700899322 /* SDL_joystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_joystick_c.h; sourceTree = "<group>"; }; 04BDFE1712E6671700899322 /* SDL_joystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_joystick_c.h; sourceTree = "<group>"; };
04BDFE1812E6671700899322 /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = "<group>"; }; 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = "<group>"; };
04BDFE3312E6671700899322 /* SDL_sysloadso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysloadso.c; sourceTree = "<group>"; }; 04BDFE3312E6671700899322 /* SDL_sysloadso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysloadso.c; sourceTree = "<group>"; };
04BDFE3712E6671700899322 /* SDL_dlcompat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dlcompat.c; sourceTree = "<group>"; };
04BDFE4B12E6671700899322 /* SDL_syspower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syspower.c; sourceTree = "<group>"; }; 04BDFE4B12E6671700899322 /* SDL_syspower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syspower.c; sourceTree = "<group>"; };
04BDFE4E12E6671700899322 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_power.c; sourceTree = "<group>"; }; 04BDFE4E12E6671700899322 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_power.c; sourceTree = "<group>"; };
04BDFE5512E6671700899322 /* SDL_assert_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert_c.h; path = ../../src/SDL_assert_c.h; sourceTree = SOURCE_ROOT; }; 04BDFE5512E6671700899322 /* SDL_assert_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert_c.h; path = ../../src/SDL_assert_c.h; sourceTree = SOURCE_ROOT; };
@ -1299,14 +1296,6 @@
path = dlopen; path = dlopen;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04BDFE3612E6671700899322 /* macosx */ = {
isa = PBXGroup;
children = (
04BDFE3712E6671700899322 /* SDL_dlcompat.c */,
);
path = macosx;
sourceTree = "<group>";
};
04BDFE4512E6671700899322 /* power */ = { 04BDFE4512E6671700899322 /* power */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -2098,7 +2087,6 @@
04BD006612E6671800899322 /* SDL_sysjoystick.c in Sources */, 04BD006612E6671800899322 /* SDL_sysjoystick.c in Sources */,
04BD007012E6671800899322 /* SDL_joystick.c in Sources */, 04BD007012E6671800899322 /* SDL_joystick.c in Sources */,
04BD008812E6671800899322 /* SDL_sysloadso.c in Sources */, 04BD008812E6671800899322 /* SDL_sysloadso.c in Sources */,
04BD008A12E6671800899322 /* SDL_dlcompat.c in Sources */,
04BD009412E6671800899322 /* SDL_syspower.c in Sources */, 04BD009412E6671800899322 /* SDL_syspower.c in Sources */,
04BD009612E6671800899322 /* SDL_power.c in Sources */, 04BD009612E6671800899322 /* SDL_power.c in Sources */,
04BD009C12E6671800899322 /* SDL_assert.c in Sources */, 04BD009C12E6671800899322 /* SDL_assert.c in Sources */,
@ -2210,7 +2198,6 @@
04BD028112E6671800899322 /* SDL_sysjoystick.c in Sources */, 04BD028112E6671800899322 /* SDL_sysjoystick.c in Sources */,
04BD028B12E6671800899322 /* SDL_joystick.c in Sources */, 04BD028B12E6671800899322 /* SDL_joystick.c in Sources */,
04BD02A312E6671800899322 /* SDL_sysloadso.c in Sources */, 04BD02A312E6671800899322 /* SDL_sysloadso.c in Sources */,
04BD02A512E6671800899322 /* SDL_dlcompat.c in Sources */,
04BD02AE12E6671800899322 /* SDL_syspower.c in Sources */, 04BD02AE12E6671800899322 /* SDL_syspower.c in Sources */,
04BD02B012E6671800899322 /* SDL_power.c in Sources */, 04BD02B012E6671800899322 /* SDL_power.c in Sources */,
04BD02B612E6671800899322 /* SDL_assert.c in Sources */, 04BD02B612E6671800899322 /* SDL_assert.c in Sources */,

16856
configure vendored
View file

File diff suppressed because it is too large Load diff

9
configure.in
View file

@ -2282,15 +2282,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
CheckDiskAudio CheckDiskAudio
CheckDummyAudio CheckDummyAudio
CheckDLOPEN CheckDLOPEN
# Set up files for the shared object loading library
# (this needs to be done before the dynamic X11 check)
if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
AC_DEFINE(SDL_LOADSO_DLCOMPAT, 1, [ ])
SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
have_loadso=yes
fi
CheckCOCOA CheckCOCOA
CheckX11 CheckX11
CheckMacGL CheckMacGL

1
include/SDL_config.h.in
View file

@ -219,7 +219,6 @@
/* Enable various shared object loading systems */ /* Enable various shared object loading systems */
#undef SDL_LOADSO_BEOS #undef SDL_LOADSO_BEOS
#undef SDL_LOADSO_DLCOMPAT
#undef SDL_LOADSO_DLOPEN #undef SDL_LOADSO_DLOPEN
#undef SDL_LOADSO_DUMMY #undef SDL_LOADSO_DUMMY
#undef SDL_LOADSO_LDG #undef SDL_LOADSO_LDG

1390
src/loadso/macosx/SDL_dlcompat.c
View file

File diff suppressed because it is too large Load diff

282
test/configure vendored
View file

@ -1,11 +1,11 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65. # Generated by GNU Autoconf 2.67.
# #
# #
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Inc. # Foundation, Inc.
# #
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@ -315,7 +315,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break test -d "$as_dir" && break
done done
test -z "$as_dirs" || eval "mkdir $as_dirs" test -z "$as_dirs" || eval "mkdir $as_dirs"
} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p } # as_fn_mkdir_p
@ -355,19 +355,19 @@ else
fi # as_fn_arith fi # as_fn_arith
# as_fn_error ERROR [LINENO LOG_FD] # as_fn_error STATUS ERROR [LINENO LOG_FD]
# --------------------------------- # ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
# script with status $?, using 1 if that was 0. # script with STATUS, using 1 if that was 0.
as_fn_error () as_fn_error ()
{ {
as_status=$?; test $as_status -eq 0 && as_status=1 as_status=$1; test $as_status -eq 0 && as_status=1
if test "$3"; then if test "$4"; then
as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi fi
$as_echo "$as_me: error: $1" >&2 $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status as_fn_exit $as_status
} # as_fn_error } # as_fn_error
@ -529,7 +529,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1 exec 6>&1
# Name of the host. # Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too. # so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@ -699,8 +699,9 @@ do
fi fi
case $ac_option in case $ac_option in
*=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
*) ac_optarg=yes ;; *=) ac_optarg= ;;
*) ac_optarg=yes ;;
esac esac
# Accept the important Cygnus configure options, so we can diagnose typos. # Accept the important Cygnus configure options, so we can diagnose typos.
@ -745,7 +746,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error "invalid feature name: $ac_useropt" as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in case $ac_user_opts in
@ -771,7 +772,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error "invalid feature name: $ac_useropt" as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in case $ac_user_opts in
@ -975,7 +976,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error "invalid package name: $ac_useropt" as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in case $ac_user_opts in
@ -991,7 +992,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error "invalid package name: $ac_useropt" as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in case $ac_user_opts in
@ -1021,8 +1022,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;; x_libraries=$ac_optarg ;;
-*) as_fn_error "unrecognized option: \`$ac_option' -*) as_fn_error $? "unrecognized option: \`$ac_option'
Try \`$0 --help' for more information." Try \`$0 --help' for more information"
;; ;;
*=*) *=*)
@ -1030,7 +1031,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names. # Reject names that are not valid shell variable names.
case $ac_envvar in #( case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* ) '' | [0-9]* | *[!_$as_cr_alnum]* )
as_fn_error "invalid variable name: \`$ac_envvar'" ;; as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac esac
eval $ac_envvar=\$ac_optarg eval $ac_envvar=\$ac_optarg
export $ac_envvar ;; export $ac_envvar ;;
@ -1048,13 +1049,13 @@ done
if test -n "$ac_prev"; then if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'` ac_option=--`echo $ac_prev | sed 's/_/-/g'`
as_fn_error "missing argument to $ac_option" as_fn_error $? "missing argument to $ac_option"
fi fi
if test -n "$ac_unrecognized_opts"; then if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in case $enable_option_checking in
no) ;; no) ;;
fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac esac
fi fi
@ -1077,7 +1078,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;; [\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac esac
as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done done
# There might be people who depend on the old broken behavior: `$host' # There might be people who depend on the old broken behavior: `$host'
@ -1091,8 +1092,8 @@ target=$target_alias
if test "x$host_alias" != x; then if test "x$host_alias" != x; then
if test "x$build_alias" = x; then if test "x$build_alias" = x; then
cross_compiling=maybe cross_compiling=maybe
$as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2 If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes cross_compiling=yes
fi fi
@ -1107,9 +1108,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" && ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` && ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
as_fn_error "working directory cannot be determined" as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" || test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
as_fn_error "pwd does not report name of working directory" as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
@ -1148,11 +1149,11 @@ else
fi fi
if test ! -r "$srcdir/$ac_unique_file"; then if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`( ac_abs_confdir=`(
cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)` pwd)`
# When building in place, set srcdir=. # When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then if test "$ac_abs_confdir" = "$ac_pwd"; then
@ -1192,7 +1193,7 @@ Configuration:
--help=short display options specific to this package --help=short display options specific to this package
--help=recursive display the short help of all the included packages --help=recursive display the short help of all the included packages
-V, --version display version information and exit -V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache' -C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files -n, --no-create do not create output files
@ -1340,9 +1341,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
configure configure
generated by GNU Autoconf 2.65 generated by GNU Autoconf 2.67
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. gives unlimited permission to copy, distribute and modify it.
_ACEOF _ACEOF
@ -1500,7 +1501,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err mv -f conftest.er1 conftest.err
fi fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } >/dev/null && { test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err test ! -s conftest.err
}; then : }; then :
@ -1520,7 +1521,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was It was created by $as_me, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@ $ $0 $@
@ -1630,11 +1631,9 @@ trap 'exit_status=$?
{ {
echo echo
cat <<\_ASBOX $as_echo "## ---------------- ##
## ---------------- ##
## Cache variables. ## ## Cache variables. ##
## ---------------- ## ## ---------------- ##"
_ASBOX
echo echo
# The following way of writing the cache mishandles newlines in values, # The following way of writing the cache mishandles newlines in values,
( (
@ -1668,11 +1667,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
) )
echo echo
cat <<\_ASBOX $as_echo "## ----------------- ##
## ----------------- ##
## Output variables. ## ## Output variables. ##
## ----------------- ## ## ----------------- ##"
_ASBOX
echo echo
for ac_var in $ac_subst_vars for ac_var in $ac_subst_vars
do do
@ -1685,11 +1682,9 @@ _ASBOX
echo echo
if test -n "$ac_subst_files"; then if test -n "$ac_subst_files"; then
cat <<\_ASBOX $as_echo "## ------------------- ##
## ------------------- ##
## File substitutions. ## ## File substitutions. ##
## ------------------- ## ## ------------------- ##"
_ASBOX
echo echo
for ac_var in $ac_subst_files for ac_var in $ac_subst_files
do do
@ -1703,11 +1698,9 @@ _ASBOX
fi fi
if test -s confdefs.h; then if test -s confdefs.h; then
cat <<\_ASBOX $as_echo "## ----------- ##
## ----------- ##
## confdefs.h. ## ## confdefs.h. ##
## ----------- ## ## ----------- ##"
_ASBOX
echo echo
cat confdefs.h cat confdefs.h
echo echo
@ -1762,7 +1755,12 @@ _ACEOF
ac_site_file1=NONE ac_site_file1=NONE
ac_site_file2=NONE ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then if test -n "$CONFIG_SITE"; then
ac_site_file1=$CONFIG_SITE # We do not want a PATH search for config.site.
case $CONFIG_SITE in #((
-*) ac_site_file1=./$CONFIG_SITE;;
*/*) ac_site_file1=$CONFIG_SITE;;
*) ac_site_file1=./$CONFIG_SITE;;
esac
elif test "x$prefix" != xNONE; then elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site ac_site_file2=$prefix/etc/config.site
@ -1777,7 +1775,11 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;} $as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5 sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file" . "$ac_site_file" \
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
done done
@ -1853,7 +1855,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi fi
## -------------------- ## ## -------------------- ##
## Main body of script. ## ## Main body of script. ##
@ -1869,16 +1871,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir/../build-scripts; do for ac_dir in $srcdir/../build-scripts; do
for ac_t in install-sh install.sh shtool; do if test -f "$ac_dir/install-sh"; then
if test -f "$ac_dir/$ac_t"; then ac_aux_dir=$ac_dir
ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c"
ac_install_sh="$ac_aux_dir/$ac_t -c" break
break 2 elif test -f "$ac_dir/install.sh"; then
fi ac_aux_dir=$ac_dir
done ac_install_sh="$ac_aux_dir/install.sh -c"
break
elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done done
if test -z "$ac_aux_dir"; then if test -z "$ac_aux_dir"; then
as_fn_error "cannot find install-sh, install.sh, or shtool in $srcdir/../build-scripts" "$LINENO" 5 as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/../build-scripts" "$LINENO" 5
fi fi
# These three variables are undocumented and unsupported, # These three variables are undocumented and unsupported,
@ -1892,7 +1900,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# Make sure we can run config.sub. # Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; } $as_echo_n "checking build system type... " >&6; }
@ -1903,16 +1911,16 @@ else
test "x$ac_build_alias" = x && test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x && test "x$ac_build_alias" = x &&
as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; } $as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in case $ac_cv_build in
*-*-*) ;; *-*-*) ;;
*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac esac
build=$ac_cv_build build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-' ac_save_IFS=$IFS; IFS='-'
@ -1937,7 +1945,7 @@ else
ac_cv_host=$ac_cv_build ac_cv_host=$ac_cv_build
else else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi fi
fi fi
@ -1945,7 +1953,7 @@ fi
$as_echo "$ac_cv_host" >&6; } $as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in case $ac_cv_host in
*-*-*) ;; *-*-*) ;;
*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac esac
host=$ac_cv_host host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-' ac_save_IFS=$IFS; IFS='-'
@ -2263,8 +2271,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "no acceptable C compiler found in \$PATH as_fn_error $? "no acceptable C compiler found in \$PATH
See \`config.log' for more details." "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler. # Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@ -2378,9 +2386,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ as_fn_set_status 77 as_fn_error 77 "C compiler cannot create executables
as_fn_error "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5 ; }
See \`config.log' for more details." "$LINENO" 5; }; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
@ -2422,8 +2429,8 @@ done
else else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "cannot compute suffix of executables: cannot compile and link as_fn_error $? "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
rm -f conftest conftest$ac_cv_exeext rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@ -2480,9 +2487,9 @@ $as_echo "$ac_try_echo"; } >&5
else else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "cannot run C compiled programs. as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'. If you meant to cross compile, use \`--host'.
See \`config.log' for more details." "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
fi fi
fi fi
@ -2533,8 +2540,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "cannot compute suffix of object files: cannot compile as_fn_error $? "cannot compute suffix of object files: cannot compile
See \`config.log' for more details." "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi fi
@ -3176,7 +3183,7 @@ rm -f core conftest.err conftest.$ac_objext \
fi fi
SDL_CFLAGS="" SDL_CFLAGS=""
SDL_LIBS="" SDL_LIBS=""
as_fn_error "*** SDL version $SDL_VERSION not found!" "$LINENO" 5 as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
fi fi
@ -3228,7 +3235,7 @@ else
# Broken: fails on valid input. # Broken: fails on valid input.
continue continue
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how. # can be detected and how.
@ -3244,11 +3251,11 @@ else
ac_preproc_ok=: ac_preproc_ok=:
break break
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
done done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then : if $ac_preproc_ok; then :
break break
fi fi
@ -3287,7 +3294,7 @@ else
# Broken: fails on valid input. # Broken: fails on valid input.
continue continue
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how. # can be detected and how.
@ -3303,18 +3310,18 @@ else
ac_preproc_ok=: ac_preproc_ok=:
break break
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
done done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then : if $ac_preproc_ok; then :
else else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "C preprocessor \"$CPP\" fails sanity check as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
ac_ext=c ac_ext=c
@ -3339,7 +3346,7 @@ if test "x$with_x" = xno; then
have_x=disabled have_x=disabled
else else
case $x_includes,$x_libraries in #( case $x_includes,$x_libraries in #(
*\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
@ -3357,7 +3364,7 @@ libdir:
@echo libdir='${LIBDIR}' @echo libdir='${LIBDIR}'
_ACEOF _ACEOF
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us. # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
for ac_var in incroot usrlibdir libdir; do for ac_var in incroot usrlibdir libdir; do
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done done
@ -3443,7 +3450,7 @@ else
fi fi
done done
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
fi # $ac_x_includes = no fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then if test "$ac_x_libraries" = no; then
@ -3754,6 +3761,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
ac_libobjs= ac_libobjs=
ac_ltlibobjs= ac_ltlibobjs=
U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed. # 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@ -3915,19 +3923,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# as_fn_error ERROR [LINENO LOG_FD] # as_fn_error STATUS ERROR [LINENO LOG_FD]
# --------------------------------- # ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
# script with status $?, using 1 if that was 0. # script with STATUS, using 1 if that was 0.
as_fn_error () as_fn_error ()
{ {
as_status=$?; test $as_status -eq 0 && as_status=1 as_status=$1; test $as_status -eq 0 && as_status=1
if test "$3"; then if test "$4"; then
as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi fi
$as_echo "$as_me: error: $1" >&2 $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status as_fn_exit $as_status
} # as_fn_error } # as_fn_error
@ -4123,7 +4131,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break test -d "$as_dir" && break
done done
test -z "$as_dirs" || eval "mkdir $as_dirs" test -z "$as_dirs" || eval "mkdir $as_dirs"
} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p } # as_fn_mkdir_p
@ -4177,7 +4185,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by $as_me, which was This file was extended by $as_me, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_HEADERS = $CONFIG_HEADERS
@ -4230,10 +4238,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
config.status config.status
configured by $0, generated by GNU Autoconf 2.65, configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it." gives unlimited permission to copy, distribute and modify it."
@ -4248,11 +4256,16 @@ ac_need_defaults=:
while test $# != 0 while test $# != 0
do do
case $1 in case $1 in
--*=*) --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=: ac_shift=:
;; ;;
--*=)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=
ac_shift=:
;;
*) *)
ac_option=$1 ac_option=$1
ac_optarg=$2 ac_optarg=$2
@ -4274,6 +4287,7 @@ do
$ac_shift $ac_shift
case $ac_optarg in case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
'') as_fn_error $? "missing file argument" ;;
esac esac
as_fn_append CONFIG_FILES " '$ac_optarg'" as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;; ac_need_defaults=false;;
@ -4284,7 +4298,7 @@ do
ac_cs_silent=: ;; ac_cs_silent=: ;;
# This is an error. # This is an error.
-*) as_fn_error "unrecognized option: \`$1' -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;; Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1" *) as_fn_append ac_config_targets " $1"
@ -4335,7 +4349,7 @@ do
case $ac_config_target in case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac esac
done done
@ -4371,7 +4385,7 @@ $debug ||
{ {
tmp=./conf$$-$RANDOM tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp") (umask 077 && mkdir "$tmp")
} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section. # Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES. # No need to generate them if there are no CONFIG_FILES.
@ -4388,7 +4402,7 @@ if test "x$ac_cr" = x; then
fi fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\r' ac_cs_awk_cr='\\r'
else else
ac_cs_awk_cr=$ac_cr ac_cs_awk_cr=$ac_cr
fi fi
@ -4402,18 +4416,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF" echo "_ACEOF"
} >conf$$subs.sh || } >conf$$subs.sh ||
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
. ./conf$$subs.sh || . ./conf$$subs.sh ||
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then if test $ac_delim_n = $ac_delim_num; then
break break
elif $ac_last_try; then elif $ac_last_try; then
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi fi
@ -4502,20 +4516,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else else
cat cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error "could not setup config files machinery" "$LINENO" 5 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF _ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir), # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty # trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers). # (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=/{ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
s/:*\$(srcdir):*/:/ h
s/:*\${srcdir}:*/:/ s///
s/:*@srcdir@:*/:/ s/^/:/
s/^\([^=]*=[ ]*\):*/\1/ s/[ ]*$/:/
s/:\$(srcdir):/:/g
s/:\${srcdir}:/:/g
s/:@srcdir@:/:/g
s/^:*//
s/:*$// s/:*$//
x
s/\(=[ ]*\).*/\1/
G
s/\n//
s/^[^=]*=[ ]*$// s/^[^=]*=[ ]*$//
}' }'
fi fi
@ -4533,7 +4555,7 @@ do
esac esac
case $ac_mode$ac_tag in case $ac_mode$ac_tag in
:[FHL]*:*);; :[FHL]*:*);;
:L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;; :[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac esac
@ -4561,7 +4583,7 @@ do
[\\/$]*) false;; [\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac || esac ||
as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'" as_fn_append ac_file_inputs " '$ac_f'"
@ -4588,7 +4610,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \ *:-:* | *:-) cat >"$tmp/stdin" \
|| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac esac
;; ;;
esac esac
@ -4714,22 +4736,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack $ac_datarootdir_hack
" "
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|| as_fn_error "could not create $ac_file" "$LINENO" 5 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5 which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;} which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$tmp/stdin" rm -f "$tmp/stdin"
case $ac_file in case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";; -) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \ esac \
|| as_fn_error "could not create $ac_file" "$LINENO" 5 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;; ;;
@ -4744,7 +4766,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 || test $ac_write_fail = 0 ||
as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status. # configure is writing to config.log, and then calls config.status.
@ -4765,7 +4787,7 @@ if test "$no_create" != yes; then
exec 5>>config.log exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which # Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction. # would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit $? $ac_cs_success || as_fn_exit 1
fi fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5