diff --git a/ChangeLog b/ChangeLog index cd8e81f19..2ad8c2498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-30 Eric Wasylishen + + * Source/GNUmakefile: Remove GSGhostscriptImageRep from the build + * Source/NSImageRep.m: Remove GSGhostscriptImageRep + * configure.ac: Disable ImageMagic by default + * configure: Regenerate + 2012-01-28 Fred Kiefer * Source/NSMenu.m (-setMain:): Remove the in-window menu when diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 3d30843fa..77a936840 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -213,7 +213,6 @@ GSTextFinder.m \ GSLayoutManager.m \ GSTypesetter.m \ GSHorizontalTypesetter.m \ -GSGhostscriptImageRep.m \ GSGormLoading.m \ GSIconManager.m \ GSImageMagickImageRep.m \ diff --git a/Source/NSImageRep.m b/Source/NSImageRep.m index 4cb0e7149..f0c5a2daf 100644 --- a/Source/NSImageRep.m +++ b/Source/NSImageRep.m @@ -50,7 +50,6 @@ #import "AppKit/NSScreen.h" #import "AppKit/DPSOperators.h" #import "AppKit/PSOperators.h" -#import "GNUstepGUI/GSGhostscriptImageRep.h" #import "GNUstepGUI/GSImageMagickImageRep.h" static NSMutableArray *imageReps = nil; @@ -67,7 +66,6 @@ static Class NSImageRep_class = NULL; NSImageRep_class = self; imageReps = [[NSMutableArray alloc] initWithCapacity: 4]; [imageReps addObject: [NSBitmapImageRep class]]; - [imageReps addObject: [GSGhostscriptImageRep class]]; #if HAVE_IMAGEMAGICK [imageReps addObject: [GSImageMagickImageRep class]]; #endif diff --git a/configure b/configure index c05523e28..f010f5617 100755 --- a/configure +++ b/configure @@ -1345,7 +1345,7 @@ Optional Features: --disable-png Disable PNG support --disable-ungif Disable libungif-based GIF support --enable-libgif Enable libgif-based GIF support - --disable-imagemagick Disable ImageMagick support + --enable-imagemagick Enable ImageMagick support --disable-icu Disable International Components for Unicode --disable-aspell Disable aspell for spellchecker --disable-sound Disable sound @@ -5425,8 +5425,6 @@ fi # Check whether --enable-imagemagick was given. if test "${enable_imagemagick+set}" = set; then : enableval=$enable_imagemagick; -else - enable_imagemagick=yes fi @@ -5549,7 +5547,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi -if test "$enable_imagemagick" = "yes"; then : +if test "x$enable_imagemagick" = "xyes"; then : pkg_failed=no diff --git a/configure.ac b/configure.ac index 4092f1a52..232b4a289 100644 --- a/configure.ac +++ b/configure.ac @@ -359,9 +359,8 @@ fi #-------------------------------------------------------------------- AC_ARG_ENABLE(imagemagick, - [ --disable-imagemagick Disable ImageMagick support],, - enable_imagemagick=yes) -AS_IF([test "$enable_imagemagick" = "yes"], [ + [ --enable-imagemagick Enable ImageMagick support]) +AS_IF([test "x$enable_imagemagick" = "xyes"], [ PKG_CHECK_MODULES([IMAGEMAGICK], [MagickCore], [ GRAPHIC_CFLAGS="$IMAGEMAGICK_CFLAGS $GRAPHIC_CFLAGS"