Skip to content
Snippets Groups Projects
Commit 028dd57c authored by Danny Auble's avatar Danny Auble
Browse files

Move X_AC_PRINTF_NULL before X_AC_DEBUG so --enable-developer works

parent b6bb8311
No related branches found
No related tags found
No related merge requests found
...@@ -22282,6 +22282,49 @@ fi ...@@ -22282,6 +22282,49 @@ fi
   
   
   
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for support of printf(\"%s\", NULL)" >&5
$as_echo_n "checking for support of printf(\"%s\", NULL)... " >&6; }
if test "$cross_compiling" = yes; then :
printf_null_ok=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
int main() { char tmp[8]; char *n=NULL; snprintf(tmp,8,"%s",n); exit(0); }
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
printf_null_ok=yes
else
printf_null_ok=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
case "$host" in
*solaris*) have_solaris=yes ;;
*) have_solaris=no ;;
esac
if test "$printf_null_ok" = "no" -a "$have_solaris" = "yes" -a -d /usr/lib64/0@0.so.1; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119 or set LD_PRELOAD=/usr/lib64/0@0.so.1" "$LINENO" 5
elif test "$printf_null_ok" = "no" -a "$have_solaris" = "yes" -a -d /usr/lib/0@0.so.1; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119 or set LD_PRELOAD=/usr/lib/0@0.so.1" "$LINENO" 5
elif test "$printf_null_ok" = "no" -a "$have_solaris" = "yes"; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119" "$LINENO" 5
elif test "$printf_null_ok" = "no"; then
as_fn_error $? "printf(\"%s\", NULL) results in abort" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether debugging is enabled" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether debugging is enabled" >&5
$as_echo_n "checking whether debugging is enabled... " >&6; } $as_echo_n "checking whether debugging is enabled... " >&6; }
# Check whether --enable-debug was given. # Check whether --enable-debug was given.
...@@ -22958,48 +23001,6 @@ fi ...@@ -22958,48 +23001,6 @@ fi
   
   
   
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for support of printf(\"%s\", NULL)" >&5
$as_echo_n "checking for support of printf(\"%s\", NULL)... " >&6; }
if test "$cross_compiling" = yes; then :
printf_null_ok=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
int main() { char tmp[8]; char *n=NULL; snprintf(tmp,8,"%s",n); exit(0); }
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
printf_null_ok=yes
else
printf_null_ok=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
case "$host" in
*solaris*) have_solaris=yes ;;
*) have_solaris=no ;;
esac
if test "$printf_null_ok" = "no" -a "$have_solaris" = "yes" -a -d /usr/lib64/0@0.so.1; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119 or set LD_PRELOAD=/usr/lib64/0@0.so.1" "$LINENO" 5
elif test "$printf_null_ok" = "no" -a "$have_solaris" = "yes" -a -d /usr/lib/0@0.so.1; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119 or set LD_PRELOAD=/usr/lib/0@0.so.1" "$LINENO" 5
elif test "$printf_null_ok" = "no" -a "$have_solaris" = "yes"; then
as_fn_error $? "printf(\"%s\", NULL) results in abort, upgrade to OpenSolaris release 119" "$LINENO" 5
elif test "$printf_null_ok" = "no"; then
as_fn_error $? "printf(\"%s\", NULL) results in abort" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether to include readline suport" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether to include readline suport" >&5
$as_echo_n "checking for whether to include readline suport... " >&6; } $as_echo_n "checking for whether to include readline suport... " >&6; }
   
......
...@@ -296,6 +296,12 @@ dnl check for how to emulate setproctitle ...@@ -296,6 +296,12 @@ dnl check for how to emulate setproctitle
dnl dnl
X_AC_SETPROCTITLE X_AC_SETPROCTITLE
dnl check if we can use standard printf functions
dnl Has to happen before X_AC_DEBUG just incase --enable-developer is used.
dnl
X_AC_PRINTF_NULL
dnl check for debug compilation, must follow X_AC_CRAY dnl check for debug compilation, must follow X_AC_CRAY
dnl dnl
X_AC_DEBUG X_AC_DEBUG
...@@ -335,10 +341,6 @@ X_AC_MAN2HTML ...@@ -335,10 +341,6 @@ X_AC_MAN2HTML
AM_CONDITIONAL(HAVE_MAN2HTML, test "x$ac_have_man2html" = "xyes") AM_CONDITIONAL(HAVE_MAN2HTML, test "x$ac_have_man2html" = "xyes")
AC_SUBST(HAVE_MAN2HTML) AC_SUBST(HAVE_MAN2HTML)
dnl check if we can use standard printf functions
dnl
X_AC_PRINTF_NULL
dnl Check for whether to include readline support dnl Check for whether to include readline support
dnl dnl
X_AC_READLINE X_AC_READLINE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment