|
 |
440f6d |
--- autotrace-0.31.1.orig/configure.in
|
|
|
440f6d |
+++ autotrace-0.31.1/configure.in
|
|
|
440f6d |
@@ -282,8 +300,12 @@ AC_CHECK_LIB(dl,main,[LIBLD_LDFLAGS=-ldl
|
|
|
440f6d |
if test "x${LIBLD_LDFLAGS}" != x; then
|
|
|
440f6d |
LIBPSTOEDIT_EXTRA_LIBS="${LIBPSTOEDIT_EXTRA_LIBS} ${LIBLD_LDFLAGS}"
|
|
|
440f6d |
fi
|
|
|
440f6d |
-
|
|
|
440f6d |
-echo '*** Checking pstoedit existence TWICE(if needed) ***'
|
|
|
440f6d |
+
|
|
|
440f6d |
+echo '*** Checking pstoedit existence THRICE(if needed)***'
|
|
|
440f6d |
+echo '*** This is the 0th check ***'
|
|
|
440f6d |
+PKG_CHECK_MODULES(LIBPSTOEDIT,[pstoedit >= 3.32.1],HAVE_LIBPSTOEDIT_321=yes)
|
|
|
440f6d |
+if test ${HAVE_LIBPSTOEDIT_321} != yes; then
|
|
|
440f6d |
+ echo '*** The 0th check failed ***'
|
|
|
440f6d |
echo '*** This is the 1st check ***'
|
|
|
440f6d |
AM_PATH_PSTOEDIT(3.32.1,HAVE_LIBPSTOEDIT_321=yes)
|
|
|
440f6d |
if test ${HAVE_LIBPSTOEDIT_321} != yes; then
|
|
|
440f6d |
@@ -310,6 +332,15 @@ else
|
|
|
440f6d |
LIBPSTOEDIT_LIBS="${PSTOEDIT_LIBS} ${LIBPSTOEDIT_EXTRA_LIBS}"
|
|
|
440f6d |
LIBPSTOEDIT_CFLAGS="${PSTOEDIT_CFLAGS}"
|
|
|
440f6d |
fi
|
|
|
440f6d |
+else
|
|
|
440f6d |
+ echo '*** The 0th check is passed. ***'
|
|
|
440f6d |
+ HAVE_LIBPSTOEDIT=yes
|
|
|
440f6d |
+
|
|
|
440f6d |
+ # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1415258
|
|
|
440f6d |
+ LIBPSTOEDIT_LIBS="${LIBPSTOEDIT_LIBS/@LIBPNG_LDFLAGS@/-lpng}"
|
|
|
440f6d |
+
|
|
|
440f6d |
+ AC_DEFINE(HAVE_LIBPSTOEDIT)
|
|
|
440f6d |
+fi
|
|
|
440f6d |
|
|
|
440f6d |
if test ${HAVE_LIBPSTOEDIT} = yes; then
|
|
|
440f6d |
AC_CHECK_FUNCS([mkstemp])
|