summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-15 16:53:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-03-15 16:53:21 +0000
commit16fc40dc5375d9ffbcaaa0072ab597b39aa3e0d5 (patch)
tree3fd70fd47b17993ae03bacdb332e75feb7557c45 /configure.ac
parent89b87c04469d716cdf90bc422c5e829178a9fe32 (diff)
set include dir on arm etc as well
Change-Id: I13bf9ff8e824f69f54158af1aaf6d4cb5709b04a
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 7d15f816380f..22c0f09dc750 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7479,6 +7479,12 @@ else
SYSTEM_JPEG=
AC_MSG_RESULT([internal, jpeg-turbo])
BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
+ LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
+ if test "$COM" = "MSC"; then
+ LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
+ else
+ LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
+ fi
case "$host_cpu" in
x86_64 | amd64 | i*86 | x86 | ia32)
@@ -7643,12 +7649,6 @@ _EOS
fi
AC_MSG_WARN([no suitable nasm (Netwide Assembler) found])
fi
- LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
- if test "$COM" = "MSC"; then
- LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
- else
- LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
- fi
;;
esac
fi