libgnomeprint r2333 - in trunk: . libgnomeprint libgnomeprint/modules

[kmaraas svn gnome org]

Author: kmaraas
Date: Sun Apr 12 15:49:43 2009
New Revision: 2333
URL: http://svn.gnome.org/viewvc/libgnomeprint?rev=2333&view=rev

Log:
2009-04-12  Kjartan Maraas  <kmaraas gnome org>

	* configure.in: 
	* libgnomeprint/Makefile.am:
	* libgnomeprint/modules/Makefile.am:
	Cygwin fixes from the Cygwin port maintainer.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnomeprint/Makefile.am
   trunk/libgnomeprint/modules/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 12 15:49:43 2009
@@ -148,9 +148,15 @@
 dnl Checking for libm
 dnl =================================
 AC_CHECK_LIBM
-if test "x$LIBM" = "x"; then
-	AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
-fi
+case "$host_os" in
+	beos* | cygwin* | pw32* | darwin*)
+		# These systems don't have libm, or don't need it
+		;;
+	*)
+		if test "x$LIBM" = "x"; then
+			AC_MSG_ERROR(You need -lm(mathematic library) for this version of libgnomeprint.)
+		fi ;;
+esac
 LDFLAGS="$LDFLAGS $LIBM"
 
 dnl =================================
@@ -341,7 +347,6 @@
 cygwin*)
     platform_win32=yes
     os_win32=no
-    AC_DEFINE(HAVE_GDI, 1, [Define to 1 if we are going to build the gdi (win32) driver])
     SOPREFIX=cyg
     SOEXT=.dll
     ;;

Modified: trunk/libgnomeprint/Makefile.am
==============================================================================
--- trunk/libgnomeprint/Makefile.am	(original)
+++ trunk/libgnomeprint/Makefile.am	Sun Apr 12 15:49:43 2009
@@ -53,7 +53,7 @@
 	gnome-print-unit.c \
 	gnome-print-paper.c
 
-if PLATFORM_WIN32
+if OS_WIN32
     nox_sources += gnome-print-gdi.c gnome-print-gdi.h
     LIBGNOMEPRINT_LIBS += -lgdi32 -lwinspool
 endif

Modified: trunk/libgnomeprint/modules/Makefile.am
==============================================================================
--- trunk/libgnomeprint/modules/Makefile.am	(original)
+++ trunk/libgnomeprint/modules/Makefile.am	Sun Apr 12 15:49:43 2009
@@ -10,7 +10,7 @@
 PAPI_DIR=
 endif
 
-if PLATFORM_WIN32
+if OS_WIN32
 WIN32_DIR=win32
 else
 WIN32_DIR=