3507
3508
if test -n "$GCC"; then
3508
if test -n "$GCC"; then
3512
# Fucking Apple let // comments sneak into OpenGL headers, so
3513
# we *must* allow // comments when compiling on Mac OS 10.6! FUCK!
3516
if test -n "$GCC"; then
3509
3517
{ echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5
3510
3518
echo $ECHO_N "checking whether gcc accepts -std=c89... $ECHO_C" >&6; }
3511
3519
if test "${ac_cv_gcc_accepts_std+set}" = set; then
6142
6153
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
6144
6155
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
6145
for ac_extension in a so sl; do
6156
for ac_extension in a so sl dylib la dll; do
6146
6157
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
6147
6158
test -f "$ac_im_libdir/libX11.$ac_extension"; then
6148
6159
ac_im_usrlibdir=$ac_im_libdir; break
12489
12500
# Now check for version 1.2 in the same libs.
12501
# Try to compile, since on MacOS 10.5.7, headers are older than libs!
12502
{ echo "$as_me:$LINENO: checking for XRRGetScreenResources" >&5
12503
echo $ECHO_N "checking for XRRGetScreenResources... $ECHO_C" >&6; }
12504
if test "${ac_cv_randr_12+set}" = set; then
12505
echo $ECHO_N "(cached) $ECHO_C" >&6
12491
12509
ac_save_CPPFLAGS="$CPPFLAGS"
12492
ac_save_LDFLAGS="$LDFLAGS"
12493
# ac_save_LIBS="$LIBS"
12495
12510
if test \! -z "$includedir" ; then
12496
12511
CPPFLAGS="$CPPFLAGS -I$includedir"
12498
# note: $X_CFLAGS includes $x_includes
12499
12513
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
12501
if test \! -z "$libdir" ; then
12502
LDFLAGS="$LDFLAGS -L$libdir"
12504
# note: $X_LIBS includes $x_libraries
12505
LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
12507
12514
CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
12508
LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS`
12509
{ echo "$as_me:$LINENO: checking for XRRGetOutputInfo in -lc" >&5
12510
echo $ECHO_N "checking for XRRGetOutputInfo in -lc... $ECHO_C" >&6; }
12511
if test "${ac_cv_lib_c_XRRGetOutputInfo+set}" = set; then
12512
echo $ECHO_N "(cached) $ECHO_C" >&6
12514
ac_check_lib_save_LIBS=$LIBS
12515
LIBS="-lc $SAVER_LIBS $LIBS"
12516
cat >conftest.$ac_ext <<_ACEOF
12515
cat >conftest.$ac_ext <<_ACEOF
12517
12516
/* confdefs.h. */
12519
12518
cat confdefs.h >>conftest.$ac_ext
12520
12519
cat >>conftest.$ac_ext <<_ACEOF
12521
12520
/* end confdefs.h. */
12523
/* Override any GCC internal prototype to avoid an error.
12524
Use char because int might match the return type of a GCC
12525
builtin and then its argument prototype would still apply. */
12529
char XRRGetOutputInfo ();
12521
#include <stdlib.h>
12522
#include <X11/Xlib.h>
12523
#include <X11/extensions/Xrandr.h>
12533
return XRRGetOutputInfo ();
12527
XRRScreenResources *res =
12528
XRRGetScreenResources (0, 0);
12538
rm -rf conftest.$ac_objext conftest$ac_exeext
12539
if { (ac_try="$ac_link"
12533
rm -rf conftest.$ac_objext
12534
if { (ac_try="$ac_compile"
12540
12535
case "(($ac_try" in
12541
12536
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12542
12537
*) ac_try_echo=$ac_try;;
12544
12539
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12545
(eval "$ac_link") 2>conftest.er1
12540
(eval "$ac_compile") 2>conftest.er1
12547
12542
grep -v '^ *+' conftest.er1 >conftest.err
12548
12543
rm -rf conftest.er1
12551
12546
(exit $ac_status); } && {
12552
12547
test -z "$ac_c_werror_flag" ||
12553
12548
test ! -s conftest.err
12554
} && test -s conftest$ac_exeext &&
12555
$as_test_x conftest$ac_exeext; then
12556
ac_cv_lib_c_XRRGetOutputInfo=yes
12549
} && test -s conftest.$ac_objext; then
12558
12552
echo "$as_me: failed program was:" >&5
12559
12553
sed 's/^/| /' conftest.$ac_ext >&5
12561
ac_cv_lib_c_XRRGetOutputInfo=no
12564
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12565
conftest$ac_exeext conftest.$ac_ext
12566
LIBS=$ac_check_lib_save_LIBS
12558
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12559
CPPFLAGS="$ac_save_CPPFLAGS"
12568
{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_XRRGetOutputInfo" >&5
12569
echo "${ECHO_T}$ac_cv_lib_c_XRRGetOutputInfo" >&6; }
12570
if test $ac_cv_lib_c_XRRGetOutputInfo = yes; then
12571
cat >>confdefs.h <<\_ACEOF
12561
{ echo "$as_me:$LINENO: result: $ac_cv_randr_12" >&5
12562
echo "${ECHO_T}$ac_cv_randr_12" >&6; }
12563
if test "$ac_cv_randr_12" = yes ; then
12564
cat >>confdefs.h <<\_ACEOF
12572
12565
#define HAVE_RANDR_12 1
12579
CPPFLAGS="$ac_save_CPPFLAGS"
12580
LDFLAGS="$ac_save_LDFLAGS"
12581
# LIBS="$ac_save_LIBS"
12569
# AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)],
12570
# [true], $SAVER_LIBS)
21299
21288
LOCK_OBJS!$LOCK_OBJS$ac_delim
21300
21289
JPEG_EXES!$JPEG_EXES$ac_delim
21301
21290
GL_EXES!$GL_EXES$ac_delim
21291
RETIRED_GL_EXES!$RETIRED_GL_EXES$ac_delim
21302
21292
SUID_EXES!$SUID_EXES$ac_delim
21303
21293
GL_UTIL_EXES!$GL_UTIL_EXES$ac_delim
21304
21294
GL_MEN!$GL_MEN$ac_delim
added
removed
configure
