Skip to content

Commit 914d892

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/pull/8488
1 parent 56dbefe commit 914d892

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

configure

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,7 +5322,7 @@ MAGICK_PATCHLEVEL_VERSION=37
53225322

53235323
MAGICK_VERSION=6.9.13-37
53245324

5325-
MAGICK_GIT_REVISION=d9ae5cde0:20251214
5325+
MAGICK_GIT_REVISION=56dbefe7c:20251214
53265326

53275327

53285328
# Substitute library versioning
@@ -27633,7 +27633,41 @@ main (void)
2763327633
_ACEOF
2763427634
if ac_fn_c_try_compile "$LINENO"
2763527635
then :
27636+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
27637+
printf "%s\n" "yes" >&6; }
27638+
else case e in #(
27639+
e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
27640+
printf "%s\n" "no" >&6; }
27641+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether our compiler supports __FUNCTION__" >&5
27642+
printf %s "checking whether our compiler supports __FUNCTION__... " >&6; }
27643+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
27644+
/* end confdefs.h. */
2763627645

27646+
int
27647+
main (void)
27648+
{
27649+
{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }
27650+
;
27651+
return 0;
27652+
}
27653+
_ACEOF
27654+
if ac_fn_c_try_compile "$LINENO"
27655+
then :
27656+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
27657+
printf "%s\n" "yes" >&6; }
27658+
27659+
printf "%s\n" "#define __func__ __FUNCTION__" >>confdefs.h
27660+
27661+
else case e in #(
27662+
e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
27663+
printf "%s\n" "no" >&6; }
27664+
27665+
printf "%s\n" "#define __func__ __FILE__" >>confdefs.h
27666+
;;
27667+
esac
27668+
fi
27669+
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
27670+
esac
2763727671
fi
2763827672
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
2763927673

@@ -33273,7 +33307,7 @@ else
3327333307
printf "%s\n" "#define MAGICK_FONT_PATH \"$with_fontpath\"" >>confdefs.h
3327433308

3327533309
fi
33276-
if test "$with_fontpath=" != ''; then
33310+
if test "$with_fontpath" != ''; then
3327733311
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontpath=$with_fontpath "
3327833312
fi
3327933313

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,18 +1027,18 @@ AC_CHECK_SIZEOF([void *])
10271027
########
10281028
AC_MSG_CHECKING([whether our compiler supports __func__])
10291029
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
1030-
[{ const char *func = __func__; return(func != 0 ? 0 : 1); }],
1030+
[{ const char *func = __func__; return(func != 0 ? 0 : 1); }])],
10311031
AC_MSG_RESULT([yes]),
10321032
AC_MSG_RESULT([no])
10331033
AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
1034-
AC_COMPILE_IFELSE([],
1035-
[{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }],
1034+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
1035+
[{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }])],
10361036
AC_MSG_RESULT([yes])
10371037
AC_DEFINE(__func__, __FUNCTION__,
10381038
[Define to appropriate substitute if compiler does not have __func__]),
10391039
AC_MSG_RESULT([no])
10401040
AC_DEFINE(__func__, __FILE__,
1041-
[Define to appropriate substitute if compiler does not have __func__])))])
1041+
[Define to appropriate substitute if compiler does not have __func__])))
10421042

10431043
########
10441044
#
@@ -2215,7 +2215,7 @@ if test "$with_fontpath" != "yes" && test -z "$with_fontpath"; then
22152215
else
22162216
AC_DEFINE_UNQUOTED([MAGICK_FONT_PATH],["$with_fontpath"],[Define to prepend to default font search path.])
22172217
fi
2218-
if test "$with_fontpath=" != ''; then
2218+
if test "$with_fontpath" != ''; then
22192219
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontpath=$with_fontpath "
22202220
fi
22212221

0 commit comments

Comments
 (0)