From: glenlow <devnull@localhost>
Date: Fri, 1 Feb 2008 02:31:10 +0000 (+0000)
Subject: fix quartz test
X-Git-Tag: LAST_LIBGRAPH~32^2~4794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58b1047e775dde4b36849ab75ef52924ce1d192c;p=graphviz

fix quartz test
---

diff --git a/configure.ac b/configure.ac
index 003fedfee..093b3437f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1908,21 +1908,16 @@ dnl -----------------------------------
 dnl INCLUDES and LIBS for QUARTZ 
 
 AC_ARG_WITH(quartz,
-  [AC_HELP_STRING([--with-quartz=no], [quartz library])],
+  [AC_HELP_STRING([--with-quartz=no], [Quartz framework (Mac OS X)])],
   [], [with_quartz=no])
 
 if test "x$with_quartz" = "xyes"; then
-#PKG_CHECK_MODULES(QUARTZ, [libquartz >= 0.4],
-#	[HAVE_QUARTZ=1
-#	AC_DEFINE_UNQUOTED(HAVE_QUARTZ,1,
-#		[Define if you have the quartz library for SWF support])],
-#	[AC_MSG_WARN(quartz library not available)])
 
 if test -d "/System/Library/Frameworks/ApplicationServices.framework"; then
 HAVE_QUARTZ=1
-AC_DEFINE_UNQUOTED(HAVE_QUARTZ,1,[Define if you have the quartz library for SWF support])
-QUARTZ_CFLAGS='-I/usr/include/quartz'
-QUARTZ_LIBS='-L/usr/lib -lquartz'
+AC_DEFINE_UNQUOTED(HAVE_QUARTZ,1,[Define if you have the Quartz framework for Mac OS X])
+QUARTZ_CFLAGS=''
+QUARTZ_LIBS='-framework ApplicationServices'
 fi
 
 fi
diff --git a/macbuild b/macbuild
index 143f8bcae..950511ee2 100755
--- a/macbuild
+++ b/macbuild
@@ -3,7 +3,7 @@
 PACKAGEMAKER="/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"
 
 # configure for Universal Binaries
-./configure --disable-dependency-tracking CFLAGS="-arch i386 -arch ppc" LDFLAGS="-arch i386 -arch ppc"
+./configure --disable-dependency-tracking --with-quartz CFLAGS="-arch i386 -arch ppc" LDFLAGS="-arch i386 -arch ppc"
 make
 
 # make into the macosx build directory