diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2022-10-13 21:33:50 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2022-10-14 11:23:31 +0200 |
| commit | a61ee88d59712ba9f870ac6a979fef1697232768 (patch) | |
| tree | a271f76a52327167724f8c34f9f68083c4aee9d6 /configure.ac | |
| parent | 403b4cc5c2c53d676aa4cfd919d9375ce50409eb (diff) | |
| download | ghostpdl-a61ee88d59712ba9f870ac6a979fef1697232768.tar.gz | |
Add checks for openjpeg specific memaligned allocation APIs.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f1e11940b..d5c68c4b3 100644 --- a/configure.ac +++ b/configure.ac @@ -2068,6 +2068,12 @@ else CFLAGS_OPJ_HAVE_INTTYPES_H= fi +if test "x$ac_cv_header_malloc_h" = "xyes"; then + CFLAGS_OPJ_HAVE_MALLOC_H="-DOPJ_HAVE_MALLOC_H=1" +else + CFLAGS_OPJ_HAVE_MALLOC_H= +fi + if test "x$BIGENDIAN" != "x0"; then CFLAGS_OPJ_BIGENDIAN="-DOPJ_BIG_ENDIAN" else @@ -2100,11 +2106,34 @@ if test "x$JPX_DECODER" = "x"; then JPX_DECODER=openjpeg SHARE_JPX=0 AC_CHECK_FUNCS([memalign], [have_memalign=1]) + AC_CHECK_FUNCS([aligned_alloc], [have_aligned_alloc=1]) + AC_CHECK_FUNCS([_aligned_malloc], [have__aligned_malloc=1]) + AC_CHECK_FUNCS([posix_memalign], [have_posix_memalign=1]) + + if test "x$have_aligned_alloc" = "x1"; then + CFLAGS_OPJ_HAVE_ALIGNED_ALLOC="-DOPJ_HAVE_ALIGNED_ALLOC=1" + else + CFLAGS_OPJ_HAVE_ALIGNED_ALLOC= + fi + + if test "x$have__aligned_alloc" = "x1"; then + CFLAGS_OPJ_HAVE__ALIGNED_ALLOC="-DOPJ_HAVE__ALIGNED_ALLOC=1" + else + CFLAGS_OPJ_HAVE__ALIGNED_ALLOC= + fi if test "x$have_memalign" = "x1"; then JPX_AUTOCONF_CFLAGS="" + CFLAGS_OPJ_HAVE_MEMALIGN="-DOPJ_HAVE_MEMALIGN=1" else JPX_AUTOCONF_CFLAGS="-D\"memalign(a,b)=malloc(b)\"" + CFLAGS_OPJ_HAVE_MEMALIGN= + fi + + if test "x$have_posix_memalign" = "x1"; then + CFLAGS_OPJ_HAVE_POSIX_MEMALIGN="-DOPJ_HAVE_POSIX_MEMALIGN=1" + else + CFLAGS_OPJ_HAVE_POSIX_MEMALIGN= fi CFLAGS_old="$CFLAGS" @@ -2112,7 +2141,7 @@ if test "x$JPX_DECODER" = "x"; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[JPX_AUTOCONF_CFLAGS="$JPX_AUTOCONF_CFLAGS -Wno-attributes"],[]) CFLAGS="$CFLAGS_old" - JPX_AUTOCONF_CFLAGS="$JPX_AUTOCONF_CFLAGS -DOPJ_STATIC -DMUTEX_pthread=0 $OPJ_LRINTF_SUBST -DUSE_JPIP -DUSE_OPENJPEG_JP2 $CFLAGS_OPJ_HAVE_STDINT_H $CFLAGS_OPJ_HAVE_INTTYPES_H $CFLAGS_OPJ_BIGENDIAN $CFLAGS_OPJ_HAVE_FSEEKO" + JPX_AUTOCONF_CFLAGS="$JPX_AUTOCONF_CFLAGS -DOPJ_STATIC -DMUTEX_pthread=0 $OPJ_LRINTF_SUBST -DUSE_JPIP -DUSE_OPENJPEG_JP2 $CFLAGS_OPJ_HAVE_STDINT_H $CFLAGS_OPJ_HAVE_INTTYPES_H $CFLAGS_OPJ_BIGENDIAN $CFLAGS_OPJ_HAVE_FSEEKO $CFLAGS_OPJ_HAVE_MALLOC_H $CFLAGS_OPJ_HAVE_ALIGNED_ALLOC $CFLAGS_OPJ_HAVE__ALIGNED_ALLOC $CFLAGS_OPJ_HAVE_MEMALIGN $CFLAGS_OPJ_HAVE_POSIX_MEMALIGN" JPXDEVS='$(PSD)jpx.dev' else @@ -2135,7 +2164,7 @@ if test "x$JPX_DECODER" = "x"; then fi if test x"$check_for_opj_stream_set_user_data" != x"no"; then AC_CHECK_LIB(openjp2, opj_stream_set_user_data, - [JPX_AUTOCONF_CFLAGS="$JPX_AUTOCONF_CFLAGS $OPJ_LRINTF_SUBST -DUSE_JPIP -DUSE_OPENJPEG_JP2 $CFLAGS_OPJ_HAVE_STDINT_H $CFLAGS_OPJ_HAVE_INTTYPES_H $CFLAGS_OPJ_BIGENDIAN $CFLAGS_OPJ_HAVE_FSEEKO"; + [JPX_AUTOCONF_CFLAGS="$JPX_AUTOCONF_CFLAGS $OPJ_LRINTF_SUBST -DUSE_JPIP -DUSE_OPENJPEG_JP2 $CFLAGS_OPJ_HAVE_STDINT_H $CFLAGS_OPJ_HAVE_INTTYPES_H $CFLAGS_OPJ_BIGENDIAN $CFLAGS_OPJ_HAVE_FSEEKO $CFLAGS_OPJ_HAVE_MALLOC_H $CFLAGS_OPJ_HAVE_ALIGNED_ALLOC $CFLAGS_OPJ_HAVE__ALIGNED_ALLOC $CFLAGS_OPJ_HAVE_MEMALIGN $CFLAGS_OPJ_HAVE_POSIX_MEMALIGN"; JPX_AUTOCONF_LIBS="-lopenjp2"; SHARE_JPX=1] ) |