diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index e82845bcbc83..f62e782dd859 100644 --- a/configure.ac +++ b/configure.ac @@ -6697,12 +6697,14 @@ if test "$_os" != "WINNT"; then AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(double) AC_CHECK_SIZEOF(void*) + AC_CHECK_SIZEOF(size_t) SAL_TYPES_SIZEOFSHORT=$ac_cv_sizeof_short SAL_TYPES_SIZEOFINT=$ac_cv_sizeof_int SAL_TYPES_SIZEOFLONG=$ac_cv_sizeof_long SAL_TYPES_SIZEOFLONGLONG=$ac_cv_sizeof_long_long SAL_TYPES_SIZEOFPOINTER=$ac_cv_sizeof_voidp + SIZEOF_SIZE_T=$ac_cv_sizeof_size_t dnl Allow build without AC_CHECK_ALIGNOF, grrr m4_pattern_allow([AC_CHECK_ALIGNOF]) @@ -6764,8 +6766,10 @@ else SAL_TYPES_SIZEOFLONGLONG=8 if test $WIN_HOST_BITS -eq 32; then SAL_TYPES_SIZEOFPOINTER=4 + SIZEOF_SIZE_T=4 else SAL_TYPES_SIZEOFPOINTER=8 + SIZEOF_SIZE_T=8 fi SAL_TYPES_ALIGNMENT2=2 SAL_TYPES_ALIGNMENT4=4 @@ -6773,6 +6777,7 @@ else LFS_CFLAGS='' fi AC_SUBST(LFS_CFLAGS) +AC_SUBST(SIZEOF_SIZE_T) AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFSHORT,$SAL_TYPES_SIZEOFSHORT) AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFINT,$SAL_TYPES_SIZEOFINT) @@ -8936,12 +8941,6 @@ else SYSTEM_LIBJPEG= AC_MSG_RESULT([internal, libjpeg-turbo]) BUILD_TYPE="$BUILD_TYPE LIBJPEG_TURBO" - LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/libjpeg-turbo" - if test "$COM" = "MSC"; then - LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib" - else - LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs -ljpeg" - fi case "$host_cpu" in x86_64 | amd64 | i*86 | x86 | ia32) @@ -9036,17 +9035,17 @@ else AC_MSG_CHECKING([for object file format specifier (NAFLAGS) ]) case "$objfmt" in - MSOMF) NAFLAGS='-fobj -DOBJ32';; - Win32-COFF) NAFLAGS='-fwin32 -DWIN32';; - Win64-COFF) NAFLAGS='-fwin64 -DWIN64 -D__x86_64__';; - COFF) NAFLAGS='-fcoff -DCOFF';; - a.out) NAFLAGS='-faout -DAOUT';; - BSD-a.out) NAFLAGS='-faoutb -DAOUT';; - ELF) NAFLAGS='-felf -DELF';; - ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; - RDF) NAFLAGS='-frdf -DRDF';; - Mach-O) NAFLAGS='-fmacho -DMACHO';; - Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__';; + MSOMF) NAFLAGS='-fobj -DOBJ32 -DPIC';; + Win32-COFF) NAFLAGS='-fwin32 -DWIN32 -DPIC';; + Win64-COFF) NAFLAGS='-fwin64 -DWIN64 -D__x86_64__ -DPIC';; + COFF) NAFLAGS='-fcoff -DCOFF -DPIC';; + a.out) NAFLAGS='-faout -DAOUT -DPIC';; + BSD-a.out) NAFLAGS='-faoutb -DAOUT -DPIC';; + ELF) NAFLAGS='-felf -DELF -DPIC';; + ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__ -DPIC';; + RDF) NAFLAGS='-frdf -DRDF -DPIC';; + Mach-O) NAFLAGS='-fmacho -DMACHO -DPIC';; + Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__ -DPIC';; esac AC_MSG_RESULT([$NAFLAGS]) @@ -9112,6 +9111,7 @@ _EOS fi AC_SUBST(NASM) +AC_SUBST(NAFLAGS) AC_SUBST(LIBJPEG_CFLAGS) AC_SUBST(LIBJPEG_LIBS) AC_SUBST(SYSTEM_LIBJPEG) |