From d9939b9ad64cbe7db48e2005f76d1c37aef80d4c Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 23 Oct 2009 03:34:05 +0000
Subject: [PATCH] more tweaking of external libs

git-svn-id: svn+q:///qpdf/trunk@875 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 TODO         | 33 +++++----------------------------
 configure.ac |  4 ++--
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/TODO b/TODO
index edab103c..a832a53c 100644
--- a/TODO
+++ b/TODO
@@ -8,34 +8,11 @@
  * Write documentation section on source-level API changes between 2.0
    and 2.1.
 
- * Really need to get rid of embedded external libs.  We can either
-   provide them separately for Windows or provide instructions for
-   building them.  Remember to remove -DHAVE_VSNPRINTF from
-   config-msvc and to remove --enable-build-external-libs from both.
-
-   mingw:
-
-   for pcre
-
-   ./configure --disable-shared --disable-cpp --prefix=...
-   make
-   make install
-
-   for zlib
-
-   ./conifgure --prefix=...
-   make
-   make install
-
-   for qpdf
-
-   CFLAGS="-IC:/path/to/pcre... -IC:/path/to/zlib..." \
-   LDFLAGS="-LC:/path/to/pcre... -LC:/path/to/zlib..." \
-   ./configure --disable-test-compare-images --with-buildrules=mingw
-
-   msvc:
-
-   
+ * Document building external libs.  From ../external-libs, in an msys
+   environment that supports both mingw and msvc, run ./build.sh.  The
+   resulting zip file should be extracted into qpdf, and
+   --enable-external-libs should be passed to configure.  Updated
+   README on this.  Check everything.
 
  * Windows release: config for both compilers, make install.  Create
    zip files.  Probably should put the compiler name somewhere in the
diff --git a/configure.ac b/configure.ac
index bd367726..1807d97c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,8 +321,8 @@ if test "$USE_EXTERNAL_LIBS" = "1"; then
    if test "$BUILDRULES" = "libtool"; then
       AC_MSG_ERROR([BUILDRULES=libtool is not supported when building external libraries])
    fi
-   CPPFLAGS="$CPPFLAGS -Iext/include"
-   LDFLAGS="$LDFLAGS -Lext/lib-$BUILDRULES"
+   CPPFLAGS="$CPPFLAGS -Iexternal-libs/include"
+   LDFLAGS="$LDFLAGS -Lexternal-libs/lib-$BUILDRULES"
    LIBS="$LIBS -lz -lpcre"
 fi