aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
-rw-r--r--jpeg/.cvsignore2
3 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index cf7c515b..9d206359 100755
--- a/configure
+++ b/configure
@@ -4425,11 +4425,11 @@ if test "$with_installed_jpeg" = yes; then
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 b1872733..8ee4044b 100644
--- a/configure.in
+++ b/configure.in
@@ -78,11 +78,11 @@ if test "$with_installed_jpeg" = yes; then
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 86056f0c..1ae7b7bf 100644
--- a/jpeg/.cvsignore
+++ b/jpeg/.cvsignore
@@ -6,4 +6,4 @@ Release
jpeg.plg
config.log
config.status
-
+build