Sophie

Sophie

distrib > Mageia > 6 > i586 > by-pkgid > e2c42de100a2d37d32ab705a9aa5f7b4 > files > 2

gutenprint-5.2.11-2.mga6.src.rpm

--- configure.ac	2016/01/14 03:02:49	1.269
+++ configure.ac	2016/01/29 12:41:20	1.270
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.269 2016/01/14 03:02:49 rlk Exp $
+dnl $Id: configure.ac,v 1.270 2016/01/29 12:41:20 speachy Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -87,7 +87,7 @@
 
 AC_INIT(GUTENPRINT_NAME, GUTENPRINT_VERSION, [gimp-print-devel@lists.sourceforge.net])
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.269 $)
+AC_REVISION($Revision: 1.270 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(scripts)
@@ -371,9 +371,9 @@
    BUILD_FOOMATIC=yes
 fi
 
-AC_PATH_PROG(IJS_CONFIG, ijs-config)
+PKG_CHECK_MODULES(IJS, ijs, [HAVE_IJS=yes], [HAVE_IJS=no])
 
-if test -z "${IJS_CONFIG}"  ; then
+if test "x${HAVE_IJS}" = "xno" ; then
   BUILD_GHOSTSCRIPT="no"
 else
   BUILD_GHOSTSCRIPT="yes"
@@ -620,11 +620,9 @@
 
 dnl ijs checks
 if test x${BUILD_GHOSTSCRIPT} = xyes ; then
-  if test -z "$IJS_CONFIG" ; then
-    AC_MSG_ERROR(Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed);
+  if test -z "$HAVE_IJS" ; then
+    AC_MSG_ERROR(Cannot find ijs; please ensure Ghostscript 6.53 or above is installed);
   fi
-  IJS_CFLAGS=`$IJS_CONFIG --cflags`
-  IJS_LIBS=`$IJS_CONFIG --libs`
 fi
 
 GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_MAJOR_VERSION}.${GUTENPRINT_MINOR_VERSION}
--- src/ghost/ijsgutenprint.c	2010/07/19 11:14:04	1.23
+++ src/ghost/ijsgutenprint.c	2016/01/29 12:41:21	1.24
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.23 2010/07/19 11:14:04 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.24 2016/01/29 12:41:21 speachy Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -35,8 +35,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <locale.h>
-#include <ijs.h>
-#include <ijs_server.h>
+#include <ijs/ijs.h>
+#include <ijs/ijs_server.h>
 #include <errno.h>
 #include <gutenprint/gutenprint-intl-internal.h>