60 lines
2.8 KiB
Plaintext
60 lines
2.8 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.2 2005/11/04 07:36:10 bernd Exp $
|
|
--- configure.in.orig Tue Sep 20 18:23:58 2005
|
|
+++ configure.in Thu Nov 3 14:14:41 2005
|
|
@@ -896,7 +896,7 @@ AC_ARG_WITH(libtiff, [ --without-libti
|
|
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
|
|
AC_CHECK_LIB(tiff, TIFFReadScanline,
|
|
[AC_CHECK_HEADER(tiffio.h,
|
|
- TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff',
|
|
+ TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
|
|
[AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])],
|
|
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
|
|
[AC_CHECK_HEADER(tiffio.h,
|
|
@@ -906,7 +906,7 @@ AC_ARG_WITH(libtiff, [ --without-libti
|
|
[AC_CHECK_HEADER(tiffio.h,
|
|
TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
|
|
[AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])],
|
|
- [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***)], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
|
|
+ [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***)], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -ljpeg -lz -lm)
|
|
fi
|
|
|
|
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
|
|
@@ -1032,9 +1032,9 @@ AC_ARG_WITH(libmng, [ --without-libmng
|
|
test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then
|
|
AC_CHECK_LIB(mng, mng_create,
|
|
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
|
|
- [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -lz -lm)
|
|
+ [AC_MSG_WARN(*** MNG plug-in will not be built (MNG library not found) ***)], -llcms $LIBJPEG -lz -lm)
|
|
if test "$mng_ok" = yes; then
|
|
- MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
|
|
+ MNG='mng$(EXEEXT)'; LIBMNG="-lmng -llcms $LIBJPEG $LIBPNG"
|
|
else
|
|
AC_MSG_WARN(*** MNG plug-in will not be built (MNG header file not found) ***)
|
|
fi
|
|
@@ -1071,9 +1071,9 @@ AC_ARG_WITH(aa, [ --without-aa
|
|
if test x$with_aa != xno && test -z "$LIBAA"; then
|
|
AC_CHECK_LIB(aa, aa_printf,
|
|
[AC_CHECK_HEADER(aalib.h,
|
|
- AA='aa$(EXEEXT)'; LIBAA='-laa',
|
|
+ AA='aa$(EXEEXT)'; LIBAA='-laa -L/usr/X11R6/lib -lX11',
|
|
[AC_MSG_WARN(*** AA plug-in will not be built (AA header file not found) ***)])],
|
|
- [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)])
|
|
+ [AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)], -L/usr/X11R6/lib -lX11)
|
|
fi
|
|
|
|
AC_SUBST(AA)
|
|
@@ -1224,10 +1224,10 @@ if test "x$with_lcms" != xno; then
|
|
have_lcms=yes
|
|
AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
|
|
[Define to 1 if the lcms header must be included as lcms/lcms.h]))
|
|
- ])
|
|
- ])
|
|
+ ], , -lm)
|
|
+ ], , -lm)
|
|
if test $have_lcms = yes; then
|
|
- LCMS_LIBS="-llcms"
|
|
+ LCMS_LIBS="-llcms -lm"
|
|
else
|
|
AC_MSG_WARN([*** color proof module will not be built (lcms not found or unusable) ***])
|
|
fi
|