mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set include dir on arm etc as well

Browse Source 
Change-Id: I13bf9ff8e824f69f54158af1aaf6d4cb5709b04a
This commit is contained in:
Caolán McNamara
2017-03-15 16:53:21 +00:00
parent 89b87c0446
commit 16fc40dc53
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -7479,6 +7479,12 @@ else
SYSTEM_JPEG= SYSTEM_JPEG=
AC_MSG_RESULT([internal, jpeg-turbo]) AC_MSG_RESULT([internal, jpeg-turbo])
BUILD_TYPE="$BUILD_TYPE 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 case "$host_cpu" in
x86_64 | amd64 | i*86 | x86 | ia32) x86_64 | amd64 | i*86 | x86 | ia32)
@@ -7643,12 +7649,6 @@ _EOS
fi fi
AC_MSG_WARN([no suitable nasm (Netwide Assembler) found]) AC_MSG_WARN([no suitable nasm (Netwide Assembler) found])
fi 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 esac
fi fi