Mercurial > dwindows

comparison configure @ 2202:c677d728e143

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK3: Switch to using GResource for compiled in image resources. Second commit with similar changes coming for GTK2 soon. dwindows-config --gresource will return "enabled" if GResource is supported. GLib 2.32 is required for GResource support, if GLib is older than 2.32 Dynamic Windows will fall back to the old style compiled in resource array.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 28 Nov 2020 23:47:30 +0000
parents 2a52d9fc2de4
children 12fb7f32f3a9
comparison
equal deleted inserted replaced
2201:ae6626a4331f 2202:c677d728e143
624 ARCH 624 ARCH
625 INSTALL_TEST 625 INSTALL_TEST
626 INSTALL_COMPAT 626 INSTALL_COMPAT
627 COMPAT_OBJECT 627 COMPAT_OBJECT
628 BROWSER_OBJECT 628 BROWSER_OBJECT
629 DW_GRESOURCE
629 DW_DEFINE 630 DW_DEFINE
630 DW_DIR 631 DW_DIR
631 DW_SRC 632 DW_SRC
632 TARGETS 633 TARGETS
633 SONAME 634 SONAME
644 PLATCCFLAGS 645 PLATCCFLAGS
645 INCLUDES 646 INCLUDES
646 SYSCONF_LINK_TARGET_STATIC 647 SYSCONF_LINK_TARGET_STATIC
647 SYSCONF_LINK_TARGET_SHARED2 648 SYSCONF_LINK_TARGET_SHARED2
648 SYSCONF_LINK_TARGET_SHARED 649 SYSCONF_LINK_TARGET_SHARED
650 PKG_CONFIG_LIBDIR
651 PKG_CONFIG_PATH
652 PKG_CONFIG
649 GDK_IMLIB_LIBS 653 GDK_IMLIB_LIBS
650 GDK_IMLIB_CFLAGS 654 GDK_IMLIB_CFLAGS
651 IMLIB_CONFIG 655 IMLIB_CONFIG
652 GTK_LIBS 656 GTK_LIBS
653 GTK_CFLAGS 657 GTK_CFLAGS
710 htmldir 714 htmldir
711 infodir 715 infodir
712 docdir 716 docdir
713 oldincludedir 717 oldincludedir
714 includedir 718 includedir
719 runstatedir
715 localstatedir 720 localstatedir
716 sharedstatedir 721 sharedstatedir
717 sysconfdir 722 sysconfdir
718 datadir 723 datadir
719 datarootdir 724 datarootdir
760 CPPFLAGS 765 CPPFLAGS
761 CXX 766 CXX
762 CXXFLAGS 767 CXXFLAGS
763 CCC 768 CCC
764 CPP 769 CPP
765 XMKMF' 770 XMKMF
771 PKG_CONFIG
772 PKG_CONFIG_PATH
773 PKG_CONFIG_LIBDIR
774 GLIB_CFLAGS
775 GLIB_LIBS'
766 776
767 777
768 # Initialize some variables set by options. 778 # Initialize some variables set by options.
769 ac_init_help= 779 ac_init_help=
770 ac_init_version=false 780 ac_init_version=false
799 datarootdir='${prefix}/share' 809 datarootdir='${prefix}/share'
800 datadir='${datarootdir}' 810 datadir='${datarootdir}'
801 sysconfdir='${prefix}/etc' 811 sysconfdir='${prefix}/etc'
802 sharedstatedir='${prefix}/com' 812 sharedstatedir='${prefix}/com'
803 localstatedir='${prefix}/var' 813 localstatedir='${prefix}/var'
814 runstatedir='${localstatedir}/run'
804 includedir='${prefix}/include' 815 includedir='${prefix}/include'
805 oldincludedir='/usr/include' 816 oldincludedir='/usr/include'
806 docdir='${datarootdir}/doc/${PACKAGE}' 817 docdir='${datarootdir}/doc/${PACKAGE}'
807 infodir='${datarootdir}/info' 818 infodir='${datarootdir}/info'
808 htmldir='${docdir}' 819 htmldir='${docdir}'
1051 1062
1052 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 1063 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1053 | -silent | --silent | --silen | --sile | --sil) 1064 | -silent | --silent | --silen | --sile | --sil)
1054 silent=yes ;; 1065 silent=yes ;;
1055 1066
1067 -runstatedir | --runstatedir | --runstatedi | --runstated \
1068 | --runstate | --runstat | --runsta | --runst | --runs \
1069 | --run | --ru | --r)
1070 ac_prev=runstatedir ;;
1071 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1072 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1073 | --run=* | --ru=* | --r=*)
1074 runstatedir=$ac_optarg ;;
1075
1056 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1076 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1057 ac_prev=sbindir ;; 1077 ac_prev=sbindir ;;
1058 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 1078 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
1059 | --sbi=* | --sb=*) 1079 | --sbi=* | --sb=*)
1060 sbindir=$ac_optarg ;; 1080 sbindir=$ac_optarg ;;
1188 1208
1189 # Check all directory arguments for consistency. 1209 # Check all directory arguments for consistency.
1190 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1210 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1191 datadir sysconfdir sharedstatedir localstatedir includedir \ 1211 datadir sysconfdir sharedstatedir localstatedir includedir \
1192 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1212 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1193 libdir localedir mandir 1213 libdir localedir mandir runstatedir
1194 do 1214 do
1195 eval ac_val=\$$ac_var 1215 eval ac_val=\$$ac_var
1196 # Remove trailing slashes. 1216 # Remove trailing slashes.
1197 case $ac_val in 1217 case $ac_val in
1198 */ ) 1218 */ )
1341 --sbindir=DIR system admin executables [EPREFIX/sbin] 1361 --sbindir=DIR system admin executables [EPREFIX/sbin]
1342 --libexecdir=DIR program executables [EPREFIX/libexec] 1362 --libexecdir=DIR program executables [EPREFIX/libexec]
1343 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1363 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1344 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1364 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1345 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1365 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1366 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1346 --libdir=DIR object code libraries [EPREFIX/lib] 1367 --libdir=DIR object code libraries [EPREFIX/lib]
1347 --includedir=DIR C header files [PREFIX/include] 1368 --includedir=DIR C header files [PREFIX/include]
1348 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1369 --oldincludedir=DIR C header files for non-gcc [/usr/include]
1349 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] 1370 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1350 --datadir=DIR read-only architecture-independent data [DATAROOTDIR] 1371 --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1409 you have headers in a nonstandard directory <include dir> 1430 you have headers in a nonstandard directory <include dir>
1410 CXX C++ compiler command 1431 CXX C++ compiler command
1411 CXXFLAGS C++ compiler flags 1432 CXXFLAGS C++ compiler flags
1412 CPP C preprocessor 1433 CPP C preprocessor
1413 XMKMF Path to xmkmf, Makefile generator for X Window System 1434 XMKMF Path to xmkmf, Makefile generator for X Window System
1435 PKG_CONFIG path to pkg-config utility
1436 PKG_CONFIG_PATH
1437 directories to add to pkg-config's search path
1438 PKG_CONFIG_LIBDIR
1439 path overriding pkg-config's built-in search path
1440 GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
1441 GLIB_LIBS linker flags for GLIB, overriding pkg-config
1414 1442
1415 Use these variables to override the choices made by `configure' or to help 1443 Use these variables to override the choices made by `configure' or to help
1416 it to find libraries and programs with nonstandard names/locations. 1444 it to find libraries and programs with nonstandard names/locations.
1417 1445
1418 Report bugs to the package provider. 1446 Report bugs to the package provider.
6241 rm -f conf.gdkimlibtest 6269 rm -f conf.gdkimlibtest
6242 6270
6243 else 6271 else
6244 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` 6272 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES`
6245 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` 6273 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES`
6274
6275
6276
6277
6278
6279
6280
6281 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
6282 if test -n "$ac_tool_prefix"; then
6283 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
6284 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
6285 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6286 $as_echo_n "checking for $ac_word... " >&6; }
6287 if ${ac_cv_path_PKG_CONFIG+:} false; then :
6288 $as_echo_n "(cached) " >&6
6289 else
6290 case $PKG_CONFIG in
6291 [\\/]* | ?:[\\/]*)
6292 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
6293 ;;
6294 *)
6295 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6296 for as_dir in $PATH
6297 do
6298 IFS=$as_save_IFS
6299 test -z "$as_dir" && as_dir=.
6300 for ac_exec_ext in '' $ac_executable_extensions; do
6301 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6302 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
6303 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6304 break 2
6305 fi
6306 done
6307 done
6308 IFS=$as_save_IFS
6309
6310 ;;
6311 esac
6312 fi
6313 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
6314 if test -n "$PKG_CONFIG"; then
6315 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
6316 $as_echo "$PKG_CONFIG" >&6; }
6317 else
6318 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6319 $as_echo "no" >&6; }
6320 fi
6321
6322
6323 fi
6324 if test -z "$ac_cv_path_PKG_CONFIG"; then
6325 ac_pt_PKG_CONFIG=$PKG_CONFIG
6326 # Extract the first word of "pkg-config", so it can be a program name with args.
6327 set dummy pkg-config; ac_word=$2
6328 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6329 $as_echo_n "checking for $ac_word... " >&6; }
6330 if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
6331 $as_echo_n "(cached) " >&6
6332 else
6333 case $ac_pt_PKG_CONFIG in
6334 [\\/]* | ?:[\\/]*)
6335 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
6336 ;;
6337 *)
6338 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6339 for as_dir in $PATH
6340 do
6341 IFS=$as_save_IFS
6342 test -z "$as_dir" && as_dir=.
6343 for ac_exec_ext in '' $ac_executable_extensions; do
6344 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6345 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
6346 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6347 break 2
6348 fi
6349 done
6350 done
6351 IFS=$as_save_IFS
6352
6353 ;;
6354 esac
6355 fi
6356 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
6357 if test -n "$ac_pt_PKG_CONFIG"; then
6358 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
6359 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
6360 else
6361 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6362 $as_echo "no" >&6; }
6363 fi
6364
6365 if test "x$ac_pt_PKG_CONFIG" = x; then
6366 PKG_CONFIG=""
6367 else
6368 case $cross_compiling:$ac_tool_warned in
6369 yes:)
6370 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6371 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6372 ac_tool_warned=yes ;;
6373 esac
6374 PKG_CONFIG=$ac_pt_PKG_CONFIG
6375 fi
6376 else
6377 PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
6378 fi
6379
6380 fi
6381 if test -n "$PKG_CONFIG"; then
6382 _pkg_min_version=0.9.0
6383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
6384 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
6385 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
6386 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6387 $as_echo "yes" >&6; }
6388 else
6389 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6390 $as_echo "no" >&6; }
6391 PKG_CONFIG=""
6392 fi
6393 fi
6394
6395 pkg_failed=no
6396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
6397 $as_echo_n "checking for GLIB... " >&6; }
6398
6399 if test -n "$GLIB_CFLAGS"; then
6400 pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
6401 elif test -n "$PKG_CONFIG"; then
6402 if test -n "$PKG_CONFIG" && \
6403 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32.0\""; } >&5
6404 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32.0") 2>&5
6405 ac_status=$?
6406 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6407 test $ac_status = 0; }; then
6408 pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32.0" 2>/dev/null`
6409 test "x$?" != "x0" && pkg_failed=yes
6410 else
6411 pkg_failed=yes
6412 fi
6413 else
6414 pkg_failed=untried
6415 fi
6416 if test -n "$GLIB_LIBS"; then
6417 pkg_cv_GLIB_LIBS="$GLIB_LIBS"
6418 elif test -n "$PKG_CONFIG"; then
6419 if test -n "$PKG_CONFIG" && \
6420 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32.0\""; } >&5
6421 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32.0") 2>&5
6422 ac_status=$?
6423 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6424 test $ac_status = 0; }; then
6425 pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32.0" 2>/dev/null`
6426 test "x$?" != "x0" && pkg_failed=yes
6427 else
6428 pkg_failed=yes
6429 fi
6430 else
6431 pkg_failed=untried
6432 fi
6433
6434
6435
6436 if test $pkg_failed = yes; then
6437 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6438 $as_echo "no" >&6; }
6439
6440 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
6441 _pkg_short_errors_supported=yes
6442 else
6443 _pkg_short_errors_supported=no
6444 fi
6445 if test $_pkg_short_errors_supported = yes; then
6446 GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32.0" 2>&1`
6447 else
6448 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32.0" 2>&1`
6449 fi
6450 # Put the nasty error message in config.log where it belongs
6451 echo "$GLIB_PKG_ERRORS" >&5
6452
6453 as_fn_error $? "Package requirements (glib-2.0 >= 2.32.0) were not met:
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
6464 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6465 $as_echo "no" >&6; }
6466 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
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
6479 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
6480 GLIB_LIBS=$pkg_cv_GLIB_LIBS
6481 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6482 $as_echo "yes" >&6; }
6483 DW_GRESOURCE="enabled"
6484 fi
6246 fi 6485 fi
6247 fi 6486 fi
6248 6487
6249 if test $check_pthreads = "yes"; then 6488 if test $check_pthreads = "yes"; then
6250 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" 6489 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
6510 RM="rm -f" 6749 RM="rm -f"
6511 LN="ln -s" 6750 LN="ln -s"
6512 CP="cp" 6751 CP="cp"
6513 MV="mv" 6752 MV="mv"
6514 MKDIR="mkdir" 6753 MKDIR="mkdir"
6754
6515 6755
6516 6756
6517 6757
6518 6758
6519 6759