ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.ac: use AC_LANG_SOURCE where appropriate

Browse Source
This commit is contained in:
Reuben Hawkins
2014-04-17 22:50:54 -05:00
parent 100ed0a5f9
commit 4e5e4787e4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@@ -144,26 +144,26 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE],[
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CCASFLAGS -x assembler-with-cpp" CFLAGS="$CCASFLAGS -x assembler-with-cpp"
CC="$CCAS" CC="$CCAS"
AC_COMPILE_IFELSE([[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
.fpu neon .fpu neon
.arch armv7a .arch armv7a
.object_arch armv4 .object_arch armv4
.arm .arm
pld [r0] pld [r0]
vmovn.u16 d0, q0]], ac_good_gnu_arm_assembler=yes) vmovn.u16 d0, q0]])], ac_good_gnu_arm_assembler=yes)
ac_use_gas_preprocessor=no ac_use_gas_preprocessor=no
if test "x$ac_good_gnu_arm_assembler" = "xno" ; then if test "x$ac_good_gnu_arm_assembler" = "xno" ; then
CC="gas-preprocessor.pl $CCAS" CC="gas-preprocessor.pl $CCAS"
AC_COMPILE_IFELSE([[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
.fpu neon .fpu neon
.arch armv7a .arch armv7a
.object_arch armv4 .object_arch armv4
.arm .arm
pld [r0] pld [r0]
vmovn.u16 d0, q0]], ac_use_gas_preprocessor=yes) vmovn.u16 d0, q0]])], ac_use_gas_preprocessor=yes)
fi fi
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
CC="$ac_save_CC" CC="$ac_save_CC"
@@ -189,7 +189,7 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE],[
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CCASFLAGS -mdspr2" CFLAGS="$CCASFLAGS -mdspr2"
AC_COMPILE_IFELSE([[ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
int main () int main ()
{ {
@@ -201,7 +201,7 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE],[
); );
return c; return c;
} }
]], have_mips_dspr2=yes) ]])], have_mips_dspr2=yes)
CFLAGS=$ac_save_CFLAGS CFLAGS=$ac_save_CFLAGS
if test "x$have_mips_dspr2" = "xyes" ; then if test "x$have_mips_dspr2" = "xyes" ; then

4
configure.ac
View File

@@ -235,13 +235,13 @@ VERS_1 {
global: *; global: *;
}; };
EOF EOF
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM([], [])])],
[VERSION_SCRIPT_FLAG=-Wl,--version-script,; [VERSION_SCRIPT_FLAG=-Wl,--version-script,;
AC_MSG_RESULT([yes (GNU style)])], 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_SOURCE([AC_LANG_PROGRAM([], [])])],
[VERSION_SCRIPT_FLAG=-Wl,-M,; [VERSION_SCRIPT_FLAG=-Wl,-M,;
AC_MSG_RESULT([yes (Sun style)])], AC_MSG_RESULT([yes (Sun style)])],
[]) [])