comparison configure @ 1095:1ab93c92d3ea

Add --with-gtk3 switch to enable building with GTK+ 3.x on systems where it is available. By default builds are done with GTK+ 2.x
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 30 Jun 2011 07:43:35 +0000
parents b2a4cfc3cb87
children 1c24949cf853
comparison
equal deleted inserted replaced
1094:b2a4cfc3cb87 1095:1ab93c92d3ea
701 SHELL' 701 SHELL'
702 ac_subst_files='' 702 ac_subst_files=''
703 ac_user_opts=' 703 ac_user_opts='
704 enable_option_checking 704 enable_option_checking
705 with_compat 705 with_compat
706 with_gtk3
706 with_gtk 707 with_gtk
707 with_gtkframework 708 with_gtkframework
708 with_gtkhtml 709 with_gtkhtml
709 with_gtkmozembed 710 with_gtkmozembed
710 with_arch 711 with_arch
1349 1350
1350 Optional Packages: 1351 Optional Packages:
1351 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1352 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1352 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1353 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1353 --with-compat specify this to build the optional dwcompat library 1354 --with-compat specify this to build the optional dwcompat library
1355 --with-gtk3 specify this to build with GTK+ 3.x if available
1354 --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX) 1356 --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX)
1355 --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX) 1357 --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX)
1356 --with-gtkhtml specify this to build dwindows with libgtkhtml-2 1358 --with-gtkhtml specify this to build dwindows with libgtkhtml-2
1357 --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed 1359 --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed
1358 --with-arch specify architecture: one of all, 32bit, 64bit, ppc, ppc64, x86_64, i386 1360 --with-arch specify architecture: one of all, 32bit, 64bit, ppc, ppc64, x86_64, i386
3578 if test "${with_compat+set}" = set; then : 3580 if test "${with_compat+set}" = set; then :
3579 withval=$with_compat; with_compat=$withval 3581 withval=$with_compat; with_compat=$withval
3580 else 3582 else
3581 with_compat=no 3583 with_compat=no
3582 fi 3584 fi
3585
3586
3587
3588 # Check whether --with-gtk3 was given.
3589 if test "${with_gtk3+set}" = set; then :
3590 withval=$with_gtk3; with_gtk3=$withval
3591 else
3592 with_gtk3=no
3593 fi
3594
3583 3595
3584 if test $with_compat = yes; then 3596 if test $with_compat = yes; then
3585 COMPAT_OBJECT="compat.o" 3597 COMPAT_OBJECT="compat.o"
3586 INSTALL_COMPAT="installcompat" 3598 INSTALL_COMPAT="installcompat"
3587 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" 3599 SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION"
4610 $as_echo "no" >&6; } 4622 $as_echo "no" >&6; }
4611 fi 4623 fi
4612 4624
4613 4625
4614 if test x"$PKG_CFG" != x; then 4626 if test x"$PKG_CFG" != x; then
4615 GTK_PACKAGES="gtk+-3.0" 4627 GTK_LIBS=""
4616 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 4628 if test $with_gtk3 = "yes"; then
4629 GTK_PACKAGES="gtk+-3.0"
4630 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4631 fi
4617 WEBKIT_PKG="webkit-1.1" 4632 WEBKIT_PKG="webkit-1.1"
4618 if test x"$GTK_LIBS" = x; then 4633 if test x"$GTK_LIBS" = x; then
4619 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 4634 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
4620 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 4635 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4621 else 4636 else