Formatting tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@943 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
254
configure.ac
254
configure.ac
@@ -24,9 +24,10 @@ AC_PROG_LN_S
|
|||||||
# Check whether compiler supports pointers to undefined structures
|
# Check whether compiler supports pointers to undefined structures
|
||||||
AC_MSG_CHECKING(whether compiler supports pointers to undefined structures)
|
AC_MSG_CHECKING(whether compiler supports pointers to undefined structures)
|
||||||
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
|
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
|
||||||
AC_MSG_RESULT(yes),
|
AC_MSG_RESULT(yes),
|
||||||
[AC_MSG_RESULT(no)
|
[AC_MSG_RESULT(no)
|
||||||
AC_DEFINE([INCOMPLETE_TYPES_BROKEN],[1],[Compiler does not support pointers to undefined structures.])])
|
AC_DEFINE([INCOMPLETE_TYPES_BROKEN], [1],
|
||||||
|
[Compiler does not support pointers to undefined structures.])])
|
||||||
|
|
||||||
if test "x${GCC}" = "xyes"; then
|
if test "x${GCC}" = "xyes"; then
|
||||||
if test "x${SAVED_CFLAGS}" = "x"; then
|
if test "x${SAVED_CFLAGS}" = "x"; then
|
||||||
@@ -49,7 +50,8 @@ fi
|
|||||||
# Checks for header files.
|
# Checks for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
|
AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
|
||||||
AC_CHECK_HEADER([sys/types.h], AC_DEFINE([NEED_SYS_TYPES_H], 1, [Define if you have sys/types.h]))
|
AC_CHECK_HEADER([sys/types.h],
|
||||||
|
AC_DEFINE([NEED_SYS_TYPES_H], 1, [Define if you have sys/types.h]))
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
# Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
@@ -60,80 +62,86 @@ AC_CHECK_TYPES([unsigned char, unsigned short])
|
|||||||
|
|
||||||
AC_MSG_CHECKING([if right shift is signed])
|
AC_MSG_CHECKING([if right shift is signed])
|
||||||
AC_TRY_RUN(
|
AC_TRY_RUN(
|
||||||
[#include <stdio.h>
|
[#include <stdio.h>
|
||||||
int is_shifting_signed (long arg) {
|
int is_shifting_signed (long arg) {
|
||||||
long res = arg >> 4;
|
long res = arg >> 4;
|
||||||
|
|
||||||
if (res == -0x7F7E80CL)
|
if (res == -0x7F7E80CL)
|
||||||
return 1; /* right shift is signed */
|
return 1; /* right shift is signed */
|
||||||
|
|
||||||
/* see if unsigned-shift hack will fix it. */
|
/* see if unsigned-shift hack will fix it. */
|
||||||
/* we can't just test exact value since it depends on width of long... */
|
/* we can't just test exact value since it depends on width of long... */
|
||||||
res |= (~0L) << (32-4);
|
res |= (~0L) << (32-4);
|
||||||
if (res == -0x7F7E80CL)
|
if (res == -0x7F7E80CL)
|
||||||
return 0; /* right shift is unsigned */
|
return 0; /* right shift is unsigned */
|
||||||
|
|
||||||
printf("Right shift isn't acting as I expect it to.\n");
|
printf("Right shift isn't acting as I expect it to.\n");
|
||||||
printf("I fear the JPEG software will not work at all.\n\n");
|
printf("I fear the JPEG software will not work at all.\n\n");
|
||||||
return 0; /* try it with unsigned anyway */
|
return 0; /* try it with unsigned anyway */
|
||||||
}
|
}
|
||||||
int main (void) {
|
int main (void) {
|
||||||
exit(is_shifting_signed(-0x7F7E80B1L));
|
exit(is_shifting_signed(-0x7F7E80B1L));
|
||||||
}],
|
}],
|
||||||
[AC_MSG_RESULT(no)
|
[AC_MSG_RESULT(no)
|
||||||
AC_DEFINE([RIGHT_SHIFT_IS_UNSIGNED], 1, [Define if shift is unsigned])],
|
AC_DEFINE([RIGHT_SHIFT_IS_UNSIGNED], 1, [Define if shift is unsigned])],
|
||||||
[AC_MSG_RESULT(yes)],
|
[AC_MSG_RESULT(yes)],
|
||||||
[AC_MSG_RESULT(Assuming that right shift is signed on target machine.)])
|
[AC_MSG_RESULT(Assuming that right shift is signed on target machine.)])
|
||||||
|
|
||||||
# test whether global names are unique to at least 15 chars
|
# test whether global names are unique to at least 15 chars
|
||||||
AC_MSG_CHECKING([for short external names])
|
AC_MSG_CHECKING([for short external names])
|
||||||
AC_TRY_LINK(
|
AC_TRY_LINK(
|
||||||
[int possibly_duplicate_function () { return 0; }
|
[int possibly_duplicate_function () { return 0; }
|
||||||
int possibly_dupli_function () { return 1; }], [ ],
|
int possibly_dupli_function () { return 1; }], [ ],
|
||||||
[AC_MSG_RESULT(ok)],
|
[AC_MSG_RESULT(ok)],
|
||||||
[AC_MSG_RESULT(short)
|
[AC_MSG_RESULT(short)
|
||||||
AC_DEFINE([NEED_SHORT_EXTERNAL_NAMES], 1, [Define if you need short function names])])
|
AC_DEFINE([NEED_SHORT_EXTERNAL_NAMES], 1,
|
||||||
|
[Define if you need short function names])])
|
||||||
|
|
||||||
# Checks for library functions.
|
# Checks for library functions.
|
||||||
AC_CHECK_FUNCS([memset memcpy], [],
|
AC_CHECK_FUNCS([memset memcpy], [],
|
||||||
[AC_DEFINE([NEED_BSD_STRINGS], 1,
|
[AC_DEFINE([NEED_BSD_STRINGS], 1,
|
||||||
[Define if you have BSD-like bzero and bcopy])])
|
[Define if you have BSD-like bzero and bcopy])])
|
||||||
|
|
||||||
AC_MSG_CHECKING([libjpeg API version])
|
AC_MSG_CHECKING([libjpeg API version])
|
||||||
AC_ARG_VAR(JPEG_LIB_VERSION, [libjpeg API version (62, 70, or 80)])
|
AC_ARG_VAR(JPEG_LIB_VERSION, [libjpeg API version (62, 70, or 80)])
|
||||||
if test "x$JPEG_LIB_VERSION" = "x"; then
|
if test "x$JPEG_LIB_VERSION" = "x"; then
|
||||||
AC_ARG_WITH([jpeg7],
|
AC_ARG_WITH([jpeg7],
|
||||||
AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
|
AC_HELP_STRING([--with-jpeg7],
|
||||||
AC_ARG_WITH([jpeg8],
|
[Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
|
||||||
AC_HELP_STRING([--with-jpeg8], [Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
|
AC_ARG_WITH([jpeg8],
|
||||||
if test "x${with_jpeg8}" = "xyes"; then
|
AC_HELP_STRING([--with-jpeg8],
|
||||||
JPEG_LIB_VERSION=80
|
[Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
|
||||||
|
if test "x${with_jpeg8}" = "xyes"; then
|
||||||
|
JPEG_LIB_VERSION=80
|
||||||
|
else
|
||||||
|
if test "x${with_jpeg7}" = "xyes"; then
|
||||||
|
JPEG_LIB_VERSION=70
|
||||||
else
|
else
|
||||||
if test "x${with_jpeg7}" = "xyes"; then
|
JPEG_LIB_VERSION=62
|
||||||
JPEG_LIB_VERSION=70
|
|
||||||
else
|
|
||||||
JPEG_LIB_VERSION=62
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
JPEG_LIB_VERSION_DECIMAL=`expr $JPEG_LIB_VERSION / 10`.`expr $JPEG_LIB_VERSION % 10`
|
JPEG_LIB_VERSION_DECIMAL=`expr $JPEG_LIB_VERSION / 10`.`expr $JPEG_LIB_VERSION % 10`
|
||||||
AC_SUBST(JPEG_LIB_VERSION_DECIMAL)
|
AC_SUBST(JPEG_LIB_VERSION_DECIMAL)
|
||||||
AC_MSG_RESULT([$JPEG_LIB_VERSION_DECIMAL])
|
AC_MSG_RESULT([$JPEG_LIB_VERSION_DECIMAL])
|
||||||
AC_DEFINE_UNQUOTED(JPEG_LIB_VERSION, [$JPEG_LIB_VERSION], [libjpeg API version])
|
AC_DEFINE_UNQUOTED(JPEG_LIB_VERSION, [$JPEG_LIB_VERSION],
|
||||||
|
[libjpeg API version])
|
||||||
|
|
||||||
AC_ARG_VAR(SO_MAJOR_VERSION, [Major version of the libjpeg-turbo shared library (default is determined by the API version)])
|
AC_ARG_VAR(SO_MAJOR_VERSION,
|
||||||
AC_ARG_VAR(SO_MINOR_VERSION, [Minor version of the libjpeg-turbo shared library (default is determined by the API version)])
|
[Major version of the libjpeg-turbo shared library (default is determined by the API version)])
|
||||||
|
AC_ARG_VAR(SO_MINOR_VERSION,
|
||||||
|
[Minor version of the libjpeg-turbo shared library (default is determined by the API version)])
|
||||||
if test "x$SO_MAJOR_VERSION" = "x"; then
|
if test "x$SO_MAJOR_VERSION" = "x"; then
|
||||||
case "$JPEG_LIB_VERSION" in
|
case "$JPEG_LIB_VERSION" in
|
||||||
62) SO_MAJOR_VERSION=$JPEG_LIB_VERSION ;;
|
62) SO_MAJOR_VERSION=$JPEG_LIB_VERSION ;;
|
||||||
*) SO_MAJOR_VERSION=`expr $JPEG_LIB_VERSION / 10` ;;
|
*) SO_MAJOR_VERSION=`expr $JPEG_LIB_VERSION / 10` ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if test "x$SO_MINOR_VERSION" = "x"; then
|
if test "x$SO_MINOR_VERSION" = "x"; then
|
||||||
case "$JPEG_LIB_VERSION" in
|
case "$JPEG_LIB_VERSION" in
|
||||||
80) SO_MINOR_VERSION=2 ;;
|
80) SO_MINOR_VERSION=2 ;;
|
||||||
*) SO_MINOR_VERSION=0 ;;
|
*) SO_MINOR_VERSION=0 ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RPM_CONFIG_ARGS=
|
RPM_CONFIG_ARGS=
|
||||||
@@ -144,15 +152,17 @@ MEM_SRCDST_FUNCTIONS=
|
|||||||
if test "x${with_jpeg8}" != "xyes"; then
|
if test "x${with_jpeg8}" != "xyes"; then
|
||||||
AC_MSG_CHECKING([whether to include in-memory source/destination managers])
|
AC_MSG_CHECKING([whether to include in-memory source/destination managers])
|
||||||
AC_ARG_WITH([mem-srcdst],
|
AC_ARG_WITH([mem-srcdst],
|
||||||
AC_HELP_STRING([--without-mem-srcdst], [Do not include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI]))
|
AC_HELP_STRING([--without-mem-srcdst],
|
||||||
|
[Do not include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI]))
|
||||||
if test "x$with_mem_srcdst" != "xno"; then
|
if test "x$with_mem_srcdst" != "xno"; then
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE([MEM_SRCDST_SUPPORTED], [1], [Support in-memory source/destination managers])
|
AC_DEFINE([MEM_SRCDST_SUPPORTED], [1],
|
||||||
SO_AGE=1
|
[Support in-memory source/destination managers])
|
||||||
MEM_SRCDST_FUNCTIONS="global: jpeg_mem_dest; jpeg_mem_src;";
|
SO_AGE=1
|
||||||
|
MEM_SRCDST_FUNCTIONS="global: jpeg_mem_dest; jpeg_mem_src;";
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-mem-srcdst"
|
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-mem-srcdst"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -171,7 +181,7 @@ VERSION_SCRIPT=yes
|
|||||||
AC_ARG_ENABLE([ld-version-script],
|
AC_ARG_ENABLE([ld-version-script],
|
||||||
AS_HELP_STRING([--disable-ld-version-script],
|
AS_HELP_STRING([--disable-ld-version-script],
|
||||||
[Disable linker version script for libjpeg-turbo (default is to use linker version script if the linker supports it)]),
|
[Disable linker version script for libjpeg-turbo (default is to use linker version script if the linker supports it)]),
|
||||||
[VERSION_SCRIPT=$enableval], [])
|
[VERSION_SCRIPT=$enableval], [])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether the linker supports version scripts])
|
AC_MSG_CHECKING([whether the linker supports version scripts])
|
||||||
SAVED_LDFLAGS="$LDFLAGS"
|
SAVED_LDFLAGS="$LDFLAGS"
|
||||||
@@ -182,11 +192,15 @@ VERS_1 {
|
|||||||
};
|
};
|
||||||
EOF
|
EOF
|
||||||
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
|
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
|
||||||
[VERSION_SCRIPT_FLAG=-Wl,--version-script,; AC_MSG_RESULT([yes (GNU style)])], [])
|
[VERSION_SCRIPT_FLAG=-Wl,--version-script,;
|
||||||
|
AC_MSG_RESULT([yes (GNU style)])],
|
||||||
|
[])
|
||||||
if test "x$VERSION_SCRIPT_FLAG" = "x"; then
|
if test "x$VERSION_SCRIPT_FLAG" = "x"; then
|
||||||
LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
|
LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
|
||||||
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
|
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []),
|
||||||
[VERSION_SCRIPT_FLAG=-Wl,-M,; AC_MSG_RESULT([yes (Sun style)])], [])
|
[VERSION_SCRIPT_FLAG=-Wl,-M,;
|
||||||
|
AC_MSG_RESULT([yes (Sun style)])],
|
||||||
|
[])
|
||||||
fi
|
fi
|
||||||
if test "x$VERSION_SCRIPT_FLAG" = "x"; then
|
if test "x$VERSION_SCRIPT_FLAG" = "x"; then
|
||||||
VERSION_SCRIPT=no
|
VERSION_SCRIPT=no
|
||||||
@@ -217,39 +231,43 @@ AC_DEFINE_UNQUOTED([INLINE],[$ljt_cv_inline],[How to obtain function inlining.])
|
|||||||
# Arithmetic coding support
|
# Arithmetic coding support
|
||||||
AC_MSG_CHECKING([whether to include arithmetic encoding support])
|
AC_MSG_CHECKING([whether to include arithmetic encoding support])
|
||||||
AC_ARG_WITH([arith-enc],
|
AC_ARG_WITH([arith-enc],
|
||||||
AC_HELP_STRING([--without-arith-enc], [Do not include arithmetic encoding support]))
|
AC_HELP_STRING([--without-arith-enc],
|
||||||
|
[Do not include arithmetic encoding support]))
|
||||||
if test "x$with_arith_enc" = "xno"; then
|
if test "x$with_arith_enc" = "xno"; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-enc"
|
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-enc"
|
||||||
else
|
else
|
||||||
AC_DEFINE([C_ARITH_CODING_SUPPORTED], [1], [Support arithmetic encoding])
|
AC_DEFINE([C_ARITH_CODING_SUPPORTED], [1], [Support arithmetic encoding])
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_ARITH_ENC], [test "x$with_arith_enc" != "xno"])
|
AM_CONDITIONAL([WITH_ARITH_ENC], [test "x$with_arith_enc" != "xno"])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to include arithmetic decoding support])
|
AC_MSG_CHECKING([whether to include arithmetic decoding support])
|
||||||
AC_ARG_WITH([arith-dec],
|
AC_ARG_WITH([arith-dec],
|
||||||
AC_HELP_STRING([--without-arith-dec], [Do not include arithmetic decoding support]))
|
AC_HELP_STRING([--without-arith-dec],
|
||||||
|
[Do not include arithmetic decoding support]))
|
||||||
if test "x$with_arith_dec" = "xno"; then
|
if test "x$with_arith_dec" = "xno"; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-dec"
|
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-dec"
|
||||||
else
|
else
|
||||||
AC_DEFINE([D_ARITH_CODING_SUPPORTED], [1], [Support arithmetic decoding])
|
AC_DEFINE([D_ARITH_CODING_SUPPORTED], [1], [Support arithmetic decoding])
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_ARITH_DEC], [test "x$with_arith_dec" != "xno"])
|
AM_CONDITIONAL([WITH_ARITH_DEC], [test "x$with_arith_dec" != "xno"])
|
||||||
|
|
||||||
AM_CONDITIONAL([WITH_ARITH], [test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"])
|
AM_CONDITIONAL([WITH_ARITH],
|
||||||
|
[test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"])
|
||||||
|
|
||||||
# TurboJPEG support
|
# TurboJPEG support
|
||||||
AC_MSG_CHECKING([whether to build TurboJPEG C wrapper])
|
AC_MSG_CHECKING([whether to build TurboJPEG C wrapper])
|
||||||
AC_ARG_WITH([turbojpeg],
|
AC_ARG_WITH([turbojpeg],
|
||||||
AC_HELP_STRING([--without-turbojpeg],[Do not include the TurboJPEG wrapper library and associated test programs]))
|
AC_HELP_STRING([--without-turbojpeg],
|
||||||
|
[Do not include the TurboJPEG wrapper library and associated test programs]))
|
||||||
if test "x$with_turbojpeg" = "xno"; then
|
if test "x$with_turbojpeg" = "xno"; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-turbojpeg"
|
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-turbojpeg"
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Java support
|
# Java support
|
||||||
@@ -270,47 +288,48 @@ if test "x$JAVA" = "x"; then
|
|||||||
JAVA=java
|
JAVA=java
|
||||||
fi
|
fi
|
||||||
AC_SUBST(JAVA)
|
AC_SUBST(JAVA)
|
||||||
AC_ARG_VAR(JNI_CFLAGS, [C compiler flags needed to include jni.h (default: -I/System/Library/Frameworks/JavaVM.framework/Headers on OS X, '-I/usr/java/include -I/usr/java/include/solaris' on Solaris, and '-I/usr/java/default/include -I/usr/java/default/include/linux' on Linux)])
|
AC_ARG_VAR(JNI_CFLAGS,
|
||||||
|
[C compiler flags needed to include jni.h (default: -I/System/Library/Frameworks/JavaVM.framework/Headers on OS X, '-I/usr/java/include -I/usr/java/include/solaris' on Solaris, and '-I/usr/java/default/include -I/usr/java/default/include/linux' on Linux)])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build TurboJPEG Java wrapper])
|
AC_MSG_CHECKING([whether to build TurboJPEG Java wrapper])
|
||||||
AC_ARG_WITH([java],
|
AC_ARG_WITH([java],
|
||||||
AC_HELP_STRING([--with-java],[Build Java wrapper for the TurboJPEG library]))
|
AC_HELP_STRING([--with-java], [Build Java wrapper for the TurboJPEG library]))
|
||||||
if test "x$with_turbojpeg" = "xno"; then
|
if test "x$with_turbojpeg" = "xno"; then
|
||||||
with_java=no
|
with_java=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WITH_JAVA=0
|
WITH_JAVA=0
|
||||||
if test "x$with_java" = "xyes"; then
|
if test "x$with_java" = "xyes"; then
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
|
||||||
case $host_os in
|
case $host_os in
|
||||||
darwin*)
|
darwin*)
|
||||||
DEFAULT_JNI_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
|
DEFAULT_JNI_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
|
||||||
;;
|
;;
|
||||||
solaris*)
|
solaris*)
|
||||||
DEFAULT_JNI_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris'
|
DEFAULT_JNI_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris'
|
||||||
;;
|
;;
|
||||||
linux*)
|
linux*)
|
||||||
DEFAULT_JNI_CFLAGS='-I/usr/java/default/include -I/usr/java/default/include/linux'
|
DEFAULT_JNI_CFLAGS='-I/usr/java/default/include -I/usr/java/default/include/linux'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if test "x$JNI_CFLAGS" = "x"; then
|
if test "x$JNI_CFLAGS" = "x"; then
|
||||||
JNI_CFLAGS=$DEFAULT_JNI_CFLAGS
|
JNI_CFLAGS=$DEFAULT_JNI_CFLAGS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SAVE_CPPFLAGS=${CPPFLAGS}
|
SAVE_CPPFLAGS=${CPPFLAGS}
|
||||||
CPPFLAGS="${CPPFLAGS} ${JNI_CFLAGS}"
|
CPPFLAGS="${CPPFLAGS} ${JNI_CFLAGS}"
|
||||||
AC_CHECK_HEADERS([jni.h], [DUMMY=1],
|
AC_CHECK_HEADERS([jni.h], [DUMMY=1],
|
||||||
[AC_MSG_ERROR([Could not find JNI header file])])
|
[AC_MSG_ERROR([Could not find JNI header file])])
|
||||||
CPPFLAGS=${SAVE_CPPFLAGS}
|
CPPFLAGS=${SAVE_CPPFLAGS}
|
||||||
AC_SUBST(JNI_CFLAGS)
|
AC_SUBST(JNI_CFLAGS)
|
||||||
|
|
||||||
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --with-java"
|
RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --with-java"
|
||||||
JAVA_RPM_CONTENTS_1='%dir /opt/%{name}/classes'
|
JAVA_RPM_CONTENTS_1='%dir /opt/%{name}/classes'
|
||||||
JAVA_RPM_CONTENTS_2=/opt/%{name}/classes/turbojpeg.jar
|
JAVA_RPM_CONTENTS_2=/opt/%{name}/classes/turbojpeg.jar
|
||||||
WITH_JAVA=1
|
WITH_JAVA=1
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_JAVA], [test "x$with_java" = "xyes"])
|
AM_CONDITIONAL([WITH_JAVA], [test "x$with_java" = "xyes"])
|
||||||
AC_SUBST(WITH_JAVA)
|
AC_SUBST(WITH_JAVA)
|
||||||
@@ -319,7 +338,8 @@ AC_SUBST(JAVA_RPM_CONTENTS_2)
|
|||||||
|
|
||||||
# optionally force using gas-preprocessor.pl for compatibility testing
|
# optionally force using gas-preprocessor.pl for compatibility testing
|
||||||
AC_ARG_WITH([gas-preprocessor],
|
AC_ARG_WITH([gas-preprocessor],
|
||||||
AC_HELP_STRING([--with-gas-preprocessor],[Force using gas-preprocessor.pl on ARM.]))
|
AC_HELP_STRING([--with-gas-preprocessor],
|
||||||
|
[Force using gas-preprocessor.pl on ARM.]))
|
||||||
if test "x${with_gas_preprocessor}" = "xyes"; then
|
if test "x${with_gas_preprocessor}" = "xyes"; then
|
||||||
case $host_os in
|
case $host_os in
|
||||||
darwin*)
|
darwin*)
|
||||||
@@ -334,7 +354,7 @@ fi
|
|||||||
|
|
||||||
# SIMD is optional
|
# SIMD is optional
|
||||||
AC_ARG_WITH([simd],
|
AC_ARG_WITH([simd],
|
||||||
AC_HELP_STRING([--without-simd],[Do not include SIMD extensions]))
|
AC_HELP_STRING([--without-simd], [Do not include SIMD extensions]))
|
||||||
if test "x${with_simd}" != "xno"; then
|
if test "x${with_simd}" != "xno"; then
|
||||||
# Check if we're on a supported CPU
|
# Check if we're on a supported CPU
|
||||||
AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
|
AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
|
||||||
@@ -343,12 +363,12 @@ if test "x${with_simd}" != "xno"; then
|
|||||||
AC_MSG_RESULT([yes (x86_64)])
|
AC_MSG_RESULT([yes (x86_64)])
|
||||||
AC_PROG_NASM
|
AC_PROG_NASM
|
||||||
simd_arch=x86_64
|
simd_arch=x86_64
|
||||||
;;
|
;;
|
||||||
i*86 | x86 | ia32)
|
i*86 | x86 | ia32)
|
||||||
AC_MSG_RESULT([yes (i386)])
|
AC_MSG_RESULT([yes (i386)])
|
||||||
AC_PROG_NASM
|
AC_PROG_NASM
|
||||||
simd_arch=i386
|
simd_arch=i386
|
||||||
;;
|
;;
|
||||||
arm*)
|
arm*)
|
||||||
AC_MSG_RESULT([yes (arm)])
|
AC_MSG_RESULT([yes (arm)])
|
||||||
AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used])
|
AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used])
|
||||||
@@ -358,12 +378,12 @@ if test "x${with_simd}" != "xno"; then
|
|||||||
[AC_MSG_RESULT([no])
|
[AC_MSG_RESULT([no])
|
||||||
with_simd=no
|
with_simd=no
|
||||||
AC_MSG_WARN([SIMD support can't be enabled. Performance will suffer.])])
|
AC_MSG_WARN([SIMD support can't be enabled. Performance will suffer.])])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_RESULT([no ("$host_cpu")])
|
AC_MSG_RESULT([no ("$host_cpu")])
|
||||||
AC_MSG_WARN([SIMD support not available for this CPU. Performance will suffer.])
|
AC_MSG_WARN([SIMD support not available for this CPU. Performance will suffer.])
|
||||||
with_simd=no;
|
with_simd=no;
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test "x${with_simd}" != "xno"; then
|
if test "x${with_simd}" != "xno"; then
|
||||||
@@ -412,11 +432,11 @@ AC_CONFIG_FILES([pkgscripts/Description.plist:release/Description.plist.in])
|
|||||||
AC_CONFIG_FILES([pkgscripts/Info.plist:release/Info.plist.in])
|
AC_CONFIG_FILES([pkgscripts/Info.plist:release/Info.plist.in])
|
||||||
AC_CONFIG_FILES([pkgscripts/uninstall:release/uninstall.in])
|
AC_CONFIG_FILES([pkgscripts/uninstall:release/uninstall.in])
|
||||||
if test "x$with_turbojpeg" != "xno"; then
|
if test "x$with_turbojpeg" != "xno"; then
|
||||||
AC_CONFIG_FILES([tjbenchtest])
|
AC_CONFIG_FILES([tjbenchtest])
|
||||||
fi
|
fi
|
||||||
if test "x$with_java" = "xyes"; then
|
if test "x$with_java" = "xyes"; then
|
||||||
AC_CONFIG_FILES([tjbenchtest.java])
|
AC_CONFIG_FILES([tjbenchtest.java])
|
||||||
AC_CONFIG_FILES([tjexampletest])
|
AC_CONFIG_FILES([tjexampletest])
|
||||||
fi
|
fi
|
||||||
AC_CONFIG_FILES([libjpeg.map])
|
AC_CONFIG_FILES([libjpeg.map])
|
||||||
AC_CONFIG_FILES([Makefile simd/Makefile])
|
AC_CONFIG_FILES([Makefile simd/Makefile])
|
||||||
|
|||||||
Reference in New Issue
Block a user