Mercurial > dwindows
comparison configure @ 2203:12fb7f32f3a9
GTK: DW_INCLUDE_DEPRECATED should bring in DW_INCLUDE_DEPRECATED_RESOURCES.
Can configure --with-deprecated to include our old resource system.
Fix building with older GTK releases, until GTK2 support can be added.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 29 Nov 2020 04:17:58 +0000 |
parents | c677d728e143 |
children | b86ae2abb3b3 |
comparison
equal
deleted
inserted
replaced
2202:c677d728e143 | 2203:12fb7f32f3a9 |
---|---|
6269 rm -f conf.gdkimlibtest | 6269 rm -f conf.gdkimlibtest |
6270 | 6270 |
6271 else | 6271 else |
6272 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` | 6272 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` |
6273 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` | 6273 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` |
6274 if test $with_gtk2 = "yes"; then | |
6275 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1" | |
6276 else | |
6274 | 6277 |
6275 | 6278 |
6276 | 6279 |
6277 | 6280 |
6278 | 6281 |
6448 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32.0" 2>&1` | 6451 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32.0" 2>&1` |
6449 fi | 6452 fi |
6450 # Put the nasty error message in config.log where it belongs | 6453 # Put the nasty error message in config.log where it belongs |
6451 echo "$GLIB_PKG_ERRORS" >&5 | 6454 echo "$GLIB_PKG_ERRORS" >&5 |
6452 | 6455 |
6453 as_fn_error $? "Package requirements (glib-2.0 >= 2.32.0) were not met: | 6456 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1" |
6454 | |
6455 $GLIB_PKG_ERRORS | |
6456 | |
6457 Consider adjusting the PKG_CONFIG_PATH environment variable if you | |
6458 installed software in a non-standard prefix. | |
6459 | |
6460 Alternatively, you may set the environment variables GLIB_CFLAGS | |
6461 and GLIB_LIBS to avoid the need to call pkg-config. | |
6462 See the pkg-config man page for more details." "$LINENO" 5 | |
6463 elif test $pkg_failed = untried; then | 6457 elif test $pkg_failed = untried; then |
6464 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 6458 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
6465 $as_echo "no" >&6; } | 6459 $as_echo "no" >&6; } |
6466 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 6460 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1" |
6467 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
6468 as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it | |
6469 is in your PATH or set the PKG_CONFIG environment variable to the full | |
6470 path to pkg-config. | |
6471 | |
6472 Alternatively, you may set the environment variables GLIB_CFLAGS | |
6473 and GLIB_LIBS to avoid the need to call pkg-config. | |
6474 See the pkg-config man page for more details. | |
6475 | |
6476 To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |
6477 See \`config.log' for more details" "$LINENO" 5; } | |
6478 else | 6461 else |
6479 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS | 6462 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS |
6480 GLIB_LIBS=$pkg_cv_GLIB_LIBS | 6463 GLIB_LIBS=$pkg_cv_GLIB_LIBS |
6481 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 6464 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
6482 $as_echo "yes" >&6; } | 6465 $as_echo "yes" >&6; } |
6483 DW_GRESOURCE="enabled" | 6466 DW_GRESOURCE="enabled" |
6484 fi | 6467 fi |
6468 fi | |
6485 fi | 6469 fi |
6486 fi | 6470 fi |
6487 | 6471 |
6488 if test $check_pthreads = "yes"; then | 6472 if test $check_pthreads = "yes"; then |
6489 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" | 6473 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" |