jpeg is now configured and built in a separate build directory. This fixes the problem with the CVS-controlled jconfig.h getting changed on every ./configure.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@121 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/configure b/configure
index cf7c515..9d20635 100755
--- a/configure
+++ b/configure
@@ -4425,11 +4425,11 @@
echo "using installed jpeg"
JPEG_LIB=-ljpeg
else
- JPEG_DIR=jpeg
+ JPEG_DIR=jpeg/build
JPEG_INCLUDE='-I$(top_srcdir)/jpeg'
JPEG_LIB='$(top_srcdir)/jpeg/libjpeg.a'
echo "configuring jpeg..."
- (cd jpeg; ./configure)
+ (mkdir jpeg/build; cd jpeg/build; ../configure)
echo "...done configuring jpeg"
fi
diff --git a/configure.in b/configure.in
index b187273..8ee4044 100644
--- a/configure.in
+++ b/configure.in
@@ -78,11 +78,11 @@
echo "using installed jpeg"
JPEG_LIB=-ljpeg
else
- JPEG_DIR=jpeg
+ JPEG_DIR=jpeg/build
JPEG_INCLUDE='-I$(top_srcdir)/jpeg'
JPEG_LIB='$(top_srcdir)/jpeg/libjpeg.a'
echo "configuring jpeg..."
- (cd jpeg; ./configure)
+ (mkdir jpeg/build; cd jpeg/build; ../configure)
echo "...done configuring jpeg"
fi
diff --git a/jpeg/.cvsignore b/jpeg/.cvsignore
index 86056f0..1ae7b7b 100644
--- a/jpeg/.cvsignore
+++ b/jpeg/.cvsignore
@@ -6,4 +6,4 @@
jpeg.plg
config.log
config.status
-
+build