filename | configure |
changeset | 94:8d80d9c7cc7d |
prev | 10:c898b37506e0 |
next | 180:e6dcf9b65658 |
author | nkeynes |
date | Sun Feb 05 04:05:27 2006 +0000 (17 years ago) |
permissions | -rw-r--r-- |
last change | Video code reshuffle to start getting real video happening. Implement colourspace conversions Various tweaks |
file | annotate | diff | log | raw |
1.1 --- a/configure Sun Dec 11 05:15:36 2005 +00001.2 +++ b/configure Sun Feb 05 04:05:27 2006 +00001.3 @@ -4238,7 +4238,6 @@1.4 fi1.7 -pkg_modules="libgnomeui-2.0"1.9 succeeded=no1.11 @@ -4293,23 +4292,23 @@1.12 else1.13 PKG_CONFIG_MIN_VERSION=0.9.01.14 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then1.15 - echo "$as_me:$LINENO: checking for $pkg_modules" >&51.16 -echo $ECHO_N "checking for $pkg_modules... $ECHO_C" >&61.17 -1.18 - if $PKG_CONFIG --exists "$pkg_modules" ; then1.19 + echo "$as_me:$LINENO: checking for libgnomeui-2.0 esound " >&51.20 +echo $ECHO_N "checking for libgnomeui-2.0 esound ... $ECHO_C" >&61.21 +1.22 + if $PKG_CONFIG --exists " libgnomeui-2.0 esound " ; then1.23 echo "$as_me:$LINENO: result: yes" >&51.24 echo "${ECHO_T}yes" >&61.25 succeeded=yes1.27 echo "$as_me:$LINENO: checking PACKAGE_CFLAGS" >&51.28 echo $ECHO_N "checking PACKAGE_CFLAGS... $ECHO_C" >&61.29 - PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules"`1.30 + PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " libgnomeui-2.0 esound "`1.31 echo "$as_me:$LINENO: result: $PACKAGE_CFLAGS" >&51.32 echo "${ECHO_T}$PACKAGE_CFLAGS" >&61.34 echo "$as_me:$LINENO: checking PACKAGE_LIBS" >&51.35 echo $ECHO_N "checking PACKAGE_LIBS... $ECHO_C" >&61.36 - PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules"`1.37 + PACKAGE_LIBS=`$PKG_CONFIG --libs " libgnomeui-2.0 esound "`1.38 echo "$as_me:$LINENO: result: $PACKAGE_LIBS" >&51.39 echo "${ECHO_T}$PACKAGE_LIBS" >&61.40 else1.41 @@ -4317,7 +4316,7 @@1.42 PACKAGE_LIBS=""1.43 ## If we have a custom action on failure, don't print errors, but1.44 ## do set a variable so people can do so.1.45 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`1.46 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`1.47 echo $PACKAGE_PKG_ERRORS1.48 fi1.50 @@ -4332,12 +4331,86 @@1.51 if test $succeeded = yes; then1.52 :1.53 else1.54 - { { echo "$as_me:$LINENO: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&51.55 -echo "$as_me: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}1.56 - { (exit 1); exit 1; }; }1.57 - fi1.58 -1.59 -1.60 + { { echo "$as_me:$LINENO: error: Library requirements ( libgnomeui-2.0 esound ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&51.61 +echo "$as_me: error: Library requirements ( libgnomeui-2.0 esound ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}1.62 + { (exit 1); exit 1; }; }1.63 + fi1.64 +1.65 +1.66 +1.67 +1.68 +1.69 +echo "$as_me:$LINENO: checking for glXQueryVersion in -lGL" >&51.70 +echo $ECHO_N "checking for glXQueryVersion in -lGL... $ECHO_C" >&61.71 +if test "${ac_cv_lib_GL_glXQueryVersion+set}" = set; then1.72 + echo $ECHO_N "(cached) $ECHO_C" >&61.73 +else1.74 + ac_check_lib_save_LIBS=$LIBS1.75 +LIBS="-lGL $LIBS"1.76 +cat >conftest.$ac_ext <<_ACEOF1.77 +/* confdefs.h. */1.78 +_ACEOF1.79 +cat confdefs.h >>conftest.$ac_ext1.80 +cat >>conftest.$ac_ext <<_ACEOF1.81 +/* end confdefs.h. */1.82 +1.83 +/* Override any gcc2 internal prototype to avoid an error. */1.84 +#ifdef __cplusplus1.85 +extern "C"1.86 +#endif1.87 +/* We use char because int might match the return type of a gcc21.88 + builtin and then its argument prototype would still apply. */1.89 +char glXQueryVersion ();1.90 +int1.91 +main ()1.92 +{1.93 +glXQueryVersion ();1.94 + ;1.95 + return 0;1.96 +}1.97 +_ACEOF1.98 +rm -f conftest.$ac_objext conftest$ac_exeext1.99 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&51.100 + (eval $ac_link) 2>conftest.er11.101 + ac_status=$?1.102 + grep -v '^ *+' conftest.er1 >conftest.err1.103 + rm -f conftest.er11.104 + cat conftest.err >&51.105 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.106 + (exit $ac_status); } &&1.107 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'1.108 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.109 + (eval $ac_try) 2>&51.110 + ac_status=$?1.111 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.112 + (exit $ac_status); }; } &&1.113 + { ac_try='test -s conftest$ac_exeext'1.114 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.115 + (eval $ac_try) 2>&51.116 + ac_status=$?1.117 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.118 + (exit $ac_status); }; }; then1.119 + ac_cv_lib_GL_glXQueryVersion=yes1.120 +else1.121 + echo "$as_me: failed program was:" >&51.122 +sed 's/^/| /' conftest.$ac_ext >&51.123 +1.124 +ac_cv_lib_GL_glXQueryVersion=no1.125 +fi1.126 +rm -f conftest.err conftest.$ac_objext \1.127 + conftest$ac_exeext conftest.$ac_ext1.128 +LIBS=$ac_check_lib_save_LIBS1.129 +fi1.130 +echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXQueryVersion" >&51.131 +echo "${ECHO_T}$ac_cv_lib_GL_glXQueryVersion" >&61.132 +if test $ac_cv_lib_GL_glXQueryVersion = yes; then1.133 + cat >>confdefs.h <<_ACEOF1.134 +#define HAVE_LIBGL 11.135 +_ACEOF1.136 +1.137 + LIBS="-lGL $LIBS"1.138 +1.139 +fi1.142 GETTEXT_PACKAGE=dream
.