[poppler] poppler: ChangeLog,1.425,1.426 configure.ac,1.62,1.63

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv6141

Modified Files:
	ChangeLog configure.ac 
Log Message:
2006-09-19  Kristian Høgsberg  <krh at redhat.com>

	* poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
	scan in any encodings found under ${datadir}/poppler.

	* m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -d -r1.425 -r1.426
--- ChangeLog	18 Sep 2006 15:40:50 -0000	1.425
+++ ChangeLog	19 Sep 2006 04:39:07 -0000	1.426
@@ -1,3 +1,10 @@
+2006-09-19  Kristian Høgsberg  <krh at redhat.com>
+
+	* poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
+	scan in any encodings found under ${datadir}/poppler.
+
+	* m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.
+
 2006-09-13  Kristian Høgsberg  <krh at redhat.com>
 
 	* poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- configure.ac	13 Sep 2006 20:25:03 -0000	1.62
+++ configure.ac	19 Sep 2006 04:39:07 -0000	1.63
@@ -34,20 +34,8 @@
 [  --enable-fixedpoint     use fixed point (instead of floating point) arithmetic],
 AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic]))
 
-dnl ##### Path to xpdfrc.
-dnl This ugly kludge to get the sysconfdir path is needed because
-dnl autoconf doesn't actually set the prefix variable until later.
-if test "$sysconfdir" = '${prefix}/etc'; then
-  if test "x$prefix" = xNONE; then
-    system_xpdfrc="$ac_default_prefix/etc/xpdfrc"
-  else
-    system_xpdfrc="$prefix/etc/xpdfrc"
-  fi
-else
-  system_xpdfrc="$sysconfdir/xpdfrc"
-fi
-AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc",
-                   [Full path for the system-wide xpdfrc file.])
+AC_DEFINE_DIR(SYSTEM_XPDFRC, "{sysconfdir}/xpdfrc", [System wide config file])
+AC_DEFINE_DIR(POPPLER_DATADIR, "{datadir}/poppler", [Poppler data dir])
 
 dnl ##### Checks for header files.
 AC_PATH_XTRA