Commit 198f7921 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

output a nicer and more complete summary.

2006-02-13  Sven Neumann  <sven@gimp.org>

	* configure.in: output a nicer and more complete summary.
parent 3d9837eb
2006-02-12 <weskaggs@primate.ucdavis.edu> 2006-02-13 Sven Neumann <sven@gimp.org>
* configure.in: output a nicer and more complete summary.
2006-02-12 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/core/gimplayer.c: remove extra semicolon; fix for * app/core/gimplayer.c: remove extra semicolon; fix for
bug #330882 from Jens Granseuer. bug #330882 from Jens Granseuer.
......
...@@ -897,7 +897,7 @@ if test "$gdk_target" = x11; then ...@@ -897,7 +897,7 @@ if test "$gdk_target" = x11; then
DOC_SHOOTER=doc-shooter DOC_SHOOTER=doc-shooter
dnl Test for Xmu dnl Test for Xmu
have_gimp_remote=yes enable_gimp_remote=yes
if test -z "$LIBXMU"; then if test -z "$LIBXMU"; then
gimp_save_CFLAGS="$CFLAGS" gimp_save_CFLAGS="$CFLAGS"
gimp_save_LDFLAGS="$LDFLAGS" gimp_save_LDFLAGS="$LDFLAGS"
...@@ -908,8 +908,8 @@ if test "$gdk_target" = x11; then ...@@ -908,8 +908,8 @@ if test "$gdk_target" = x11; then
GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)'; GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)';
have_libxmu=yes have_libxmu=yes
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt", LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[have_gimp_remote="no (XMU header file not found)"],[#include <gdk/gdkx.h>])], [enable_gimp_remote="no (XMU header file not found)"],[#include <gdk/gdkx.h>])],
[have_gimp_remote="no (XMU library not found)"], -lXt -lX11) [enable_gimp_remote="no (XMU library not found)"], -lXt -lX11)
CFLAGS="$gimp_save_CFLAGS" CFLAGS="$gimp_save_CFLAGS"
LDFLAGS="$gimp_save_LDFLAGS" LDFLAGS="$gimp_save_LDFLAGS"
LIBSCREENSHOT="$LIBXMU" LIBSCREENSHOT="$LIBXMU"
...@@ -1242,6 +1242,7 @@ fi ...@@ -1242,6 +1242,7 @@ fi
# Check for gnome-vfs (and optionally libgnomeui and gnome-keyring) # Check for gnome-vfs (and optionally libgnomeui and gnome-keyring)
################################################################### ###################################################################
uri_plugin=no
uri_modules="gnome-vfs-2.0 >= gnome_vfs_required_version" uri_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
...@@ -1264,6 +1265,12 @@ PKG_CHECK_MODULES(URI, $uri_modules, ...@@ -1264,6 +1265,12 @@ PKG_CHECK_MODULES(URI, $uri_modules,
AM_CONDITIONAL(HAVE_GNOMEVFS, test x$have_gnomevfs = xyes) AM_CONDITIONAL(HAVE_GNOMEVFS, test x$have_gnomevfs = xyes)
if test "x$have_gnomevfs" = xyes; then
uri_plugin="yes (using gnome-vfs)"
elif test x"$os_win32" = xno; then
uri_plugin="yes (using wget)"
fi
if test "x$have_gnomeui" = xyes; then if test "x$have_gnomeui" = xyes; then
AC_DEFINE(HAVE_GNOMEUI, 1, [Define to 1 if libgnomeui is available]) AC_DEFINE(HAVE_GNOMEUI, 1, [Define to 1 if libgnomeui is available])
fi fi
...@@ -1548,13 +1555,12 @@ AC_SUBST(WMF) ...@@ -1548,13 +1555,12 @@ AC_SUBST(WMF)
# Check for Mac OS X TWAIN framework (can't build on Darwin) # Check for Mac OS X TWAIN framework (can't build on Darwin)
############################################################ ############################################################
twain_ok=$os_win32
AC_MSG_CHECKING([checking for Mac OS X TWAIN support]) AC_MSG_CHECKING([checking for Mac OS X TWAIN support])
AC_TRY_CPP([ AC_TRY_CPP([
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <TWAIN/TWAIN.h> #include <TWAIN/TWAIN.h>
], ], twain_ok=yes)
twain_ok=yes,
twain_ok=no)
AC_MSG_RESULT($twain_ok) AC_MSG_RESULT($twain_ok)
AM_CONDITIONAL(HAVE_MAC_TWAIN, test x$twain_ok = xyes) AM_CONDITIONAL(HAVE_MAC_TWAIN, test x$twain_ok = xyes)
...@@ -1906,30 +1912,41 @@ AC_OUTPUT ...@@ -1906,30 +1912,41 @@ AC_OUTPUT
dnl Print a summary of features enabled/disabled: dnl Print a summary of features enabled/disabled:
AC_MSG_RESULT([ AC_MSG_RESULT([
Building GIMP with prefix=$prefix Building GIMP with prefix=$prefix
GIMP Features: Desktop files install into $DESKTOP_DATADIR
gimp-remote: $have_gimp_remote
tiff: $have_libtiff Extra Binaries:
jpeg: $jpeg_ok gimp-console: $enable_gimp_console
xjt: $have_xjt gimp-remote: $enable_gimp_remote
tiff: $have_libtiff
zlib: $have_zlib Optional Plug-Ins:
png: $have_libpng Ascii Art: $have_libaa
mng: $have_libmng Help Browser: $have_gtkhtml2
exif: $have_libexif Gimp-Print: $have_gimp_print
aa: $have_libaa GNOME Print: $have_gnomeprint
xpm: $have_libxpm JPEG: $jpeg_ok
help: $have_gtkhtml2 MNG: $have_libmng
svg: $have_librsvg PDF: $have_poppler
poppler: $have_poppler PNG: $have_libpng
gnome ui: $have_gnomeui PSP: $have_zlib
keyring: $have_gnome_keyring SVG: $have_librsvg
gnome vfs: $have_gnomevfs TIFF: $have_libtiff
gnomeprint: $have_gnomeprint TWAIN: $twain_ok
gimp-print: $have_gimp_print URI: $uri_plugin
wmf: $have_libwmf Win Print: $os_win32
littlecms: $have_lcms Win Snap: $os_win32
alsa: $have_alsa WMF: $have_libwmf
linux input: $have_linux_input XJT: $have_xjt
perl pdbgen: $with_pdbgen XPM: $have_libxpm
Plug-In Features:
EXIF support: $have_libexif
GNOME UI: $have_gnomeui
GNOME keyring: $have_gnome_keyring
Optional Modules:
ALSA (MIDI): $have_alsa
Linux Input: $have_linux_input
Color Correction: $have_lcms
Soft Proof: $have_lcms
]); ]);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment