[poppler] 2 commits - CMakeLists.txt configure.ac poppler/BaseFile.h poppler/Makefile.am

[Albert Astals Cid]

 CMakeLists.txt      |    1 
 configure.ac        |    5 ++-
 poppler/BaseFile.h  |   82 ----------------------------------------------------
 poppler/Makefile.am |    1 
 4 files changed, 4 insertions(+), 85 deletions(-)

New commits:
commit ba47bd2ba05f883306606eda30bff17bd4a8eec6
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Dec 26 19:47:42 2008 +0100

    BaseFile.h has never been used and it fact it's not part of xpdf sources
    
    Fixes bug 19298

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 248d311..45c77fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,6 @@ if(ENABLE_XPDF_HEADERS)
   install(FILES
     poppler/Annot.h
     poppler/Array.h
-    poppler/BaseFile.h
     poppler/BuiltinFont.h
     poppler/BuiltinFontTables.h
     poppler/Catalog.h
diff --git a/poppler/BaseFile.h b/poppler/BaseFile.h
deleted file mode 100644
index 7aedec1..0000000
--- a/poppler/BaseFile.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//========================================================================
-//
-// BaseFile.h
-//
-// Copyright 1999 Derek B. Noonburg assigned by Michael Meeks.
-//
-//========================================================================
-
-#ifndef BASEFILE_H
-#define BASEFILE_H
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Error.h"
-
-typedef FILE * BaseFile;
-
-static inline BaseFile
-bxpdfopen (GooString *fileName1)
-{
-  GooString *fileName2;
-  // try to open file
-  fileName2 = NULL;
-  BaseFile file;
-
-#ifdef VMS
-  if (!(file = fopen(fileName->getCString(), "rb", "ctx=stm"))) {
-    error(-1, "Couldn't open file '%s'", fileName->getCString());
-    return NULL;
-  }
-#else
-  if (!(file = fopen(fileName1->getCString(), "rb"))) {
-    fileName2 = fileName1->copy();
-    fileName2->lowerCase();
-    if (!(file = fopen(fileName2->getCString(), "rb"))) {
-      fileName2->upperCase();
-      if (!(file = fopen(fileName2->getCString(), "rb"))) {
-	error(-1, "Couldn't open file '%s'", fileName1->getCString());
-	delete fileName2;
-	return NULL;
-      }
-    }
-    delete fileName2;
-  }
-#endif
-  return file;
-}
-
-static inline void
-bfclose (BaseFile file)
-{
-  fclose (file);
-}
-
-static inline size_t
-bfread (void *ptr, size_t size, size_t nmemb, BaseFile file)
-{
-  return fread (ptr, size, nmemb, file);
-}
-
-static inline int
-bfseek (BaseFile file, long offset, int whence)
-{
-  return fseek (file, offset, whence);
-}
-
-static inline void
-brewind (BaseFile file)
-{
-  rewind (file);
-}
-
-static inline long
-bftell (BaseFile file)
-{
-  return ftell (file);
-}*/
-
-#endif /* BASEFILE_H */
-
-
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 5d22918..bfa4443 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -145,7 +145,6 @@ poppler_include_HEADERS =	\
 	$(splash_headers)	\
 	Annot.h			\
 	Array.h			\
-	BaseFile.h		\
 	BuiltinFont.h		\
 	BuiltinFontTables.h	\
 	Catalog.h		\
commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8
Author: Hib Eris <hib at hiberis.nl>
Date:   Wed Dec 24 19:27:19 2008 +0100

    Let libtool build DLLs on windows too

diff --git a/configure.ac b/configure.ac
index 5fa5832..47f2e70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,11 @@ AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(poppler/poppler-config.h)
 
-dnl ##### Checks for programs.
+dnl ##### Initialize libtool.
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+
+dnl ##### Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_ISC_POSIX