LOCK_OBJS
JPEG_EXES
GL_EXES
+RETIRED_GL_EXES
SUID_EXES
GL_UTIL_EXES
GL_MEN
fi
if test -n "$GCC"; then
- if test -n "$GCC"; then
+
+ case "$host" in
+ *-darwin* )
+ # Fucking Apple let // comments sneak into OpenGL headers, so
+ # we *must* allow // comments when compiling on Mac OS 10.6! FUCK!
+ ;;
+ *)
+ if test -n "$GCC"; then
{ echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5
echo $ECHO_N "checking whether gcc accepts -std=c89... $ECHO_C" >&6; }
if test "${ac_cv_gcc_accepts_std+set}" = set; then
ac_gcc_accepts_std="$ac_cv_gcc_accepts_std"
fi
+ ;;
+ esac
+
{ echo "$as_me:$LINENO: result: Disabling C++ comments in ANSI C code." >&5
echo "${ECHO_T}Disabling C++ comments in ANSI C code." >&6; }
#
else
ac_cv_header_stdc=no
fi
-rm -rf conftest*
+rm -f -r conftest*
fi
else
ac_cv_header_stdc=no
fi
-rm -rf conftest*
+rm -f -r conftest*
fi
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
else
ac_cv_os_cray=no
fi
-rm -rf conftest*
+rm -f -r conftest*
fi
{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
# Now check for version 1.2 in the same libs.
+ # Try to compile, since on MacOS 10.5.7, headers are older than libs!
+ { echo "$as_me:$LINENO: checking for XRRGetScreenResources" >&5
+echo $ECHO_N "checking for XRRGetScreenResources... $ECHO_C" >&6; }
+if test "${ac_cv_randr_12+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_randr_12=no
ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_LDFLAGS="$LDFLAGS"
-# ac_save_LIBS="$LIBS"
-
if test \! -z "$includedir" ; then
CPPFLAGS="$CPPFLAGS -I$includedir"
fi
- # note: $X_CFLAGS includes $x_includes
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
- if test \! -z "$libdir" ; then
- LDFLAGS="$LDFLAGS -L$libdir"
- fi
- # note: $X_LIBS includes $x_libraries
- LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
-
CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
- LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS`
- { echo "$as_me:$LINENO: checking for XRRGetOutputInfo in -lc" >&5
-echo $ECHO_N "checking for XRRGetOutputInfo in -lc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_c_XRRGetOutputInfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $SAVER_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XRRGetOutputInfo ();
+#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include <X11/extensions/Xrandr.h>
int
main ()
{
-return XRRGetOutputInfo ();
+XRRScreenResources *res =
+ XRRGetScreenResources (0, 0);
;
return 0;
}
_ACEOF
-rm -rf conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -rf conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -rf conftest.er1
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_c_XRRGetOutputInfo=yes
+ } && test -s conftest.$ac_objext; then
+ ac_cv_randr_12=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_c_XRRGetOutputInfo=no
+ ac_cv_randr_12=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="$ac_save_CPPFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_XRRGetOutputInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_c_XRRGetOutputInfo" >&6; }
-if test $ac_cv_lib_c_XRRGetOutputInfo = yes; then
- cat >>confdefs.h <<\_ACEOF
+{ echo "$as_me:$LINENO: result: $ac_cv_randr_12" >&5
+echo "${ECHO_T}$ac_cv_randr_12" >&6; }
+ if test "$ac_cv_randr_12" = yes ; then
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_RANDR_12 1
_ACEOF
-else
- true
-fi
-
- CPPFLAGS="$ac_save_CPPFLAGS"
- LDFLAGS="$ac_save_LDFLAGS"
-# LIBS="$ac_save_LIBS"
-
+ fi
+# AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)],
+# [true], $SAVER_LIBS)
fi
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-rm -rf conftest*
+rm -f -r conftest*
CPPFLAGS="$ac_save_CPPFLAGS"
$EGREP "Mesa|MESA" >/dev/null 2>&1; then
ac_cv_have_mesa_gl=yes
fi
-rm -rf conftest*
+rm -f -r conftest*
CPPFLAGS="$ac_save_CPPFLAGS"
fi
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat > conftest.$ac_ext <<EOF
-#line 16772 "configure"
+#line 16760 "configure"
#include "confdefs.h"
#include <GL/gl.h>
#ifndef MESA_MAJOR_VERSION
if test "$have_gl" = yes; then
GL_EXES='$(GL_EXES)'
SUID_EXES='$(SUID_EXES)'
- RETIRED_GL_EXES='$(RETIRED_EXES)'
+ RETIRED_GL_EXES='$(RETIRED_GL_EXES)'
GL_UTIL_EXES='$(GL_UTIL_EXES)'
GL_MEN='$(GL_MEN)'
GL_KLUDGE=" "
+
APPDEFAULTS=$ac_x_app_defaults
LOCK_OBJS!$LOCK_OBJS$ac_delim
JPEG_EXES!$JPEG_EXES$ac_delim
GL_EXES!$GL_EXES$ac_delim
+RETIRED_GL_EXES!$RETIRED_GL_EXES$ac_delim
SUID_EXES!$SUID_EXES$ac_delim
GL_UTIL_EXES!$GL_UTIL_EXES$ac_delim
GL_MEN!$GL_MEN$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
;;
"default-2":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+ rm -f po/stamp-it po/stamp-it.tmp
+ > po/stamp-it.tmp
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ mv po/stamp-it.tmp po/stamp-it
esac ;;
esac