maybe graphicsmagick

git-svn-id: file:///raid/svn-personal/repoview/trunk@24 7e8b2a19-8934-dd40-8cb3-db22cdd5a80f

diff --git a/CGI/Makefile b/CGI/Makefile
index 2792f65b58fc43c0e16b7595a484bb359439ff1e..47eba8b8d06647a060d2f361951ad741b05f7bfe 100644 (file)
--- a/CGI/Makefile
+++ b/CGI/Makefile
@@ -13,7 +13,7 @@ repoview.cgi: $(OBJS)
        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTLIBS)
 
 .c.o:
-       $(CC) -I $(PWD)/CGI $(CFLAGS) -c -o $@ $<
+       $(CC) $(EXTCFLAGS) -I $(PWD)/CGI $(CFLAGS) -c -o $@ $<
 
 clean:
        rm -f *.cgi *.o */*.o

diff --git a/Makefile b/Makefile
index 1078ee95652484696e100e88ac200c83af437381..faeeb3b48d7e568481ce1c19279b6f7da7324a95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PWD = `pwd`
 PLATFORM = generic
 
-FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) EXTOBJS="`./objs`" EXTLIBS="`./libs`"
+FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) EXTOBJS="`./objs`" EXTLIBS="`./libs`" EXTCFLAGS=""
 
 .PHONY: all clean format ./CGI
 
@@ -24,7 +24,7 @@ check:: check.c config.h
 
 clean:
        $(MAKE) -C ./CGI clean $(FLAGS)
-       rm -f objs libs check
+       rm -f objs libs check cflags
 
 format:
        clang-format --verbose -i `find . -name "*.c" -or -name "*.h"`

diff --git a/Platform/freebsd.mk b/Platform/freebsd.mk
index 834e08eb14ae4ed1c06cf505094568e8e07ed259..8f4c2ddd36ccb9e034bcf48c6bffd9e27b90222c 100644 (file)
--- a/Platform/freebsd.mk
+++ b/Platform/freebsd.mk
@@ -1,6 +1,6 @@
 # $Id$
 
 CC = cc
-CFLAGS = -std=c99 -I /usr/local/include
+CFLAGS = -std=c99 -I /usr/local/include -I /usr/local/include/GraphicsMagick
 LDFLAGS = -L /usr/local/lib
 LIBS = -lcrypto

diff --git a/Platform/netbsd.mk b/Platform/netbsd.mk
index 883ca165a7877f81abf6fb1cb9a8be7db0b3b2ea..5c2064769f86f5fe243b99c4f2d60a51d88fa2d0 100644 (file)
--- a/Platform/netbsd.mk
+++ b/Platform/netbsd.mk
@@ -1,6 +1,6 @@
 # $Id$
 
 CC = cc
-CFLAGS = -std=c99 -I /usr/pkg/include
+CFLAGS = -std=c99 -I /usr/pkg/include -I /usr/pkg/include/GraphicsMagick
 LDFLAGS = -L /usr/pkg/lib -Wl,-R/usr/pkg/lib
 LIBS = -lcrypto

diff --git a/config.h.tmpl b/config.h.tmpl
index ecb869a6eb10173f8bea0bb89986e24161c8a911..df1bca76a09ea18b44fd6dd2588fb13d7cd32bb4 100644 (file)
--- a/config.h.tmpl
+++ b/config.h.tmpl
@@ -48,9 +48,8 @@
 /* Authentication type. */
 #define USE_COOKIE
 
-/* GraphicsMagick or ImageMagick. */
-#define USE_IMAGEMAGICK
-#undef USE_GRAPHICSMAGICK
+/* Use GraphicsMagick or not. */
+#define USE_GRAPHICSMAGICK
 
 /* PATH, uses PATH from environment automatically if not defined. */
 #undef USE_PATH

diff --git a/libs.c b/libs.c
index 75e14239fa59d7b77e9beebcf0ddd4ec54aac6ab..0cbd98e7423c1d9cc6091c90a395a0ec5709c80b 100644 (file)
--- a/libs.c
+++ b/libs.c
@@ -13,12 +13,6 @@ int main() {
        printf(" ");
 #if defined(USE_GRAPHICSMAGICK)
        printf("-lGraphicsMagickWand");
-#elif defined(USE_IMAGEMAGICK)
-#ifdef __NetBSD__
-       printf("-lMagickWand-7.Q16HDRI");
-#else
-       printf("-lMagickWand-7");
-#endif
 #endif
        printf("\n");
        return 0;