[poppler] poppler: ChangeLog, 1.265, 1.266 NEWS, 1.12,
1.13 acinclude.m4, NONE, 1.1 configure.ac, 1.43, 1.44
Kristian Høgsberg
krh at freedesktop.org
Wed Dec 21 14:09:49 PST 2005
Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv29004
Modified Files:
ChangeLog NEWS configure.ac
Added Files:
acinclude.m4
Log Message:
2005-12-21 Kristian Høgsberg <krh at redhat.com>
* NEWS: Sum up 0.5 changes so far.
* acinclude.m4: Split jpeg macros out into this file.
* poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- ChangeLog 21 Dec 2005 17:30:33 -0000 1.265
+++ ChangeLog 21 Dec 2005 22:09:47 -0000 1.266
@@ -1,5 +1,13 @@
2005-12-21 Kristian Høgsberg <krh at redhat.com>
+ * NEWS: Sum up 0.5 changes so far.
+
+ * acinclude.m4: Split jpeg macros out into this file.
+
+ * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
+
+2005-12-21 Kristian Høgsberg <krh at redhat.com>
+
* utils/Makefile.am: Add parseargs.h to sources and add
-I$(top_srcdir)/poppler to INCLUDES.
Index: NEWS
===================================================================
RCS file: /cvs/poppler/poppler/NEWS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- NEWS 30 Jun 2005 19:44:33 -0000 1.12
+++ NEWS 21 Dec 2005 22:09:47 -0000 1.13
@@ -1,3 +1,11 @@
+Release 0.5.0
+
+ - Font matching code for non embedded fonts now use fontconfig
+ instead of hard coded list of fonts.
+ - Merge in Xpdf 3.01 changes.
+ - Add command line tools from Xpdf.
+ - Make install of Xpdf header files ./configure'able.
+
Release 0.4.0
- Real text selection.
--- NEW FILE: acinclude.m4 ---
dnl Based on Xpdf configure.in and evince configure.ac
dnl Based on kde acinclude.m4.in, LGPL Licensed
AC_DEFUN([AC_FIND_FILE],
[
$3=NO
for i in $2;
do
for j in $1;
do
echo "configure: __oline__: $i/$j" >&AC_FD_CC
if test -r "$i/$j"; then
echo "taking that" >&AC_FD_CC
$3=$i
break 2
fi
done
done
])
AC_DEFUN([KDE_FIND_JPEG_HELPER],
[
AC_MSG_CHECKING([for libjpeg$2])
AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
[
ac_save_LIBS="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
[
#ifdef __cplusplus
extern "C" {
#endif
void jpeg_CreateDecompress();
#ifdef __cplusplus
}
#endif
],
[jpeg_CreateDecompress();],
eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
eval "ac_cv_lib_jpeg_$1=no")
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
])
if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
enable_libjpeg=yes
LIBJPEG_LIBS="$ac_cv_lib_jpeg_$1"
AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
else
AC_MSG_RESULT(no)
$3
fi
])
AC_DEFUN([AC_FIND_JPEG],
[
dnl first look for libraries
KDE_FIND_JPEG_HELPER(6b, 6b,
KDE_FIND_JPEG_HELPER(normal, [],
[
LIBJPEG_LIBS=
]
)
)
dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
dnl requires system dependent includes loaded before it)
jpeg_incdirs="$includedir /usr/include /usr/local/include "
AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG_LIBS" ; then
AC_DEFINE_UNQUOTED(ENABLE_LIBJPEG, 1, [Define if you have libjpeg])
else
if test -n "$jpeg_incdir" || test -n "$LIBJPEG_LIBS" ; then
AC_MSG_WARN([
There is an installation error in jpeg support. You seem to have only one
of either the headers _or_ the libraries installed. You may need to either
provide correct --with-extra-... options, or the development package of
libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
Disabling JPEG support.
])
else
AC_MSG_WARN([libjpeg not found. disable JPEG support.])
fi
jpeg_incdir=
enable_libjpeg=no
LIBJPEG_LIBS=
fi
AC_SUBST(LIBJPEG_LIBS)
AH_VERBATIM(_AC_CHECK_JPEG,
[/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
])
])
dnl Based on kde acinclude.m4.in, LGPL Licensed
Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- configure.ac 21 Dec 2005 17:30:33 -0000 1.43
+++ configure.ac 21 Dec 2005 22:09:47 -0000 1.44
@@ -1,117 +1,3 @@
-dnl Based on Xpdf configure.in and evince configure.ac
-
-dnl Based on kde acinclude.m4.in, LGPL Licensed
-
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-void jpeg_CreateDecompress();
-#ifdef __cplusplus
-}
-#endif
-],
-[jpeg_CreateDecompress();],
- eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
- eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
- enable_libjpeg=yes
- LIBJPEG_LIBS="$ac_cv_lib_jpeg_$1"
- AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
- AC_MSG_RESULT(no)
- $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
- KDE_FIND_JPEG_HELPER(normal, [],
- [
- LIBJPEG_LIBS=
- ]
- )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include "
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG_LIBS" ; then
- AC_DEFINE_UNQUOTED(ENABLE_LIBJPEG, 1, [Define if you have libjpeg])
-else
- if test -n "$jpeg_incdir" || test -n "$LIBJPEG_LIBS" ; then
- AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
- else
- AC_MSG_WARN([libjpeg not found. disable JPEG support.])
- fi
- jpeg_incdir=
- enable_libjpeg=no
- LIBJPEG_LIBS=
-fi
-
-AC_SUBST(LIBJPEG_LIBS)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-dnl Based on kde acinclude.m4.in, LGPL Licensed
-
-
AC_PREREQ(2.59)
AC_INIT(poppler, 0.5.0)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
More information about the poppler
mailing list