comparison configure.in @ 89541:148a846dccfd

Merge from HEAD.

89540:00740a07ad9a

  ## Darwin / Mac OS X
  powerpc-apple-darwin* )
    machine=powermac opsys=darwin
    # Define CPP as follows to make autoconf work correctly.
    CPP="cc -E -traditional-cpp"
  ;;

  ## AMD x86-64 Linux-based GNU system
  x86_64-*-linux-gnu* )
    machine=amdx86-64 opsys=gnu-linux

if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
  if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
    AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
  fi
  GLIB_REQUIRED=2.0.1
  GTK_REQUIRED=2.2
  GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"

  dnl Check if --with-pkg-config-prog has been given.
  if test "X${with_pkg_config_prog}" != X; then
    PKG_CONFIG="${with_pkg_config_prog}"

89541:148a846dccfd

  ## Darwin / Mac OS X
  powerpc-apple-darwin* )
    machine=powermac opsys=darwin
    # Define CPP as follows to make autoconf work correctly.
    CPP="gcc -E -no-cpp-precomp"
  ;;

  ## AMD x86-64 Linux-based GNU system
  x86_64-*-linux-gnu* )
    machine=amdx86-64 opsys=gnu-linux

if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
  if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
    AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
  fi
  GLIB_REQUIRED=2.0.1
  GTK_REQUIRED=2.0.1
  GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"

  dnl Check if --with-pkg-config-prog has been given.
  if test "X${with_pkg_config_prog}" != X; then
    PKG_CONFIG="${with_pkg_config_prog}"