gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-24 18:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/GNUmakefile: Remove GSGhostscriptImageRep from the build

Browse source 
* Source/NSImageRep.m: Remove GSGhostscriptImageRep
* configure.ac: Disable ImageMagic by default
* configure: Regenerate


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34671 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ericwa 2012-01-30 21:06:08 +00:00
parent 424237e4d9
commit daab3df5c2
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-01-30 Eric Wasylishen <ewasylishen@gmail.com>
* 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 <FredKiefer@gmx.de>
* Source/NSMenu.m (-setMain:): Remove the in-window menu when

1
Source/GNUmakefile
View file

@ -213,7 +213,6 @@ GSTextFinder.m \
GSLayoutManager.m \
GSTypesetter.m \
GSHorizontalTypesetter.m \
GSGhostscriptImageRep.m \
GSGormLoading.m \
GSIconManager.m \
GSImageMagickImageRep.m \

2
Source/NSImageRep.m
View file

@ -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

6
configure vendored
View file

@ -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

5
configure.ac
View file

@ -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"