Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 679e33bfe74d713240fdd930602b993b937dce39 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Fri, 23 Jan 2015 03:30:47 +0900 |
| 4 | Subject: [PATCH] modify acinclude.m4 and configure.in |
| 5 | |
| 6 | this patch is from Debian to fix build errors. |
| 7 | "acinclude.m4:34: error: automatic de-ANSI-fication |
| 8 | support has been removed" |
| 9 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 10 | Upstream-Status: Pending |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 11 | |
| 12 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 13 | --- |
| 14 | acinclude.m4 | 79 ------------------------------------------------------------ |
| 15 | configure.in | 12 +++++++++ |
| 16 | 2 files changed, 12 insertions(+), 79 deletions(-) |
| 17 | |
| 18 | diff --git a/acinclude.m4 b/acinclude.m4 |
| 19 | index e9e5500..d467fb5 100644 |
| 20 | --- a/acinclude.m4 |
| 21 | +++ b/acinclude.m4 |
| 22 | @@ -30,82 +30,3 @@ AC_SUBST($1) |
| 23 | ## ------------------------------- ## |
| 24 | ## Check for function prototypes. ## |
| 25 | ## ------------------------------- ## |
| 26 | - |
| 27 | -AC_DEFUN(fp_C_PROTOTYPES, |
| 28 | -[AC_REQUIRE([AM_PROG_CC_STDC]) |
| 29 | -AC_MSG_CHECKING([for function prototypes]) |
| 30 | -if test "$ac_cv_prog_cc_stdc" != no; then |
| 31 | - AC_MSG_RESULT(yes) |
| 32 | - AC_DEFINE(PROTOTYPES) |
| 33 | - U= ANSI2KNR= |
| 34 | -else |
| 35 | - AC_MSG_RESULT(no) |
| 36 | - U=_ ANSI2KNR=./ansi2knr |
| 37 | -fi |
| 38 | -AC_SUBST(U)dnl |
| 39 | -AC_SUBST(ANSI2KNR)dnl |
| 40 | -]) |
| 41 | - |
| 42 | -## ----------------------------------------- ## |
| 43 | -## ANSIfy the C compiler whenever possible. ## |
| 44 | -## ----------------------------------------- ## |
| 45 | - |
| 46 | -# @defmac AC_PROG_CC_STDC |
| 47 | -# @maindex PROG_CC_STDC |
| 48 | -# @ovindex CC |
| 49 | -# If the C compiler in not in ANSI C mode by default, try to add an option |
| 50 | -# to output variable @code{CC} to make it so. This macro tries various |
| 51 | -# options that select ANSI C on some system or another. It considers the |
| 52 | -# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and |
| 53 | -# handles function prototypes correctly. |
| 54 | -# |
| 55 | -# If you use this macro, you should check after calling it whether the C |
| 56 | -# compiler has been set to accept ANSI C; if not, the shell variable |
| 57 | -# @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source |
| 58 | -# code in ANSI C, you can make an un-ANSIfied copy of it by using the |
| 59 | -# program @code{ansi2knr}, which comes with Ghostscript. |
| 60 | -# @end defmac |
| 61 | - |
| 62 | -AC_DEFUN(fp_PROG_CC_STDC, |
| 63 | -[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) |
| 64 | -AC_CACHE_VAL(ac_cv_prog_cc_stdc, |
| 65 | -[ac_cv_prog_cc_stdc=no |
| 66 | -ac_save_CFLAGS="$CFLAGS" |
| 67 | -# Don't try gcc -ansi; that turns off useful extensions and |
| 68 | -# breaks some systems' header files. |
| 69 | -# AIX -qlanglvl=ansi |
| 70 | -# Ultrix and OSF/1 -std1 |
| 71 | -# HP-UX -Aa -D_HPUX_SOURCE |
| 72 | -# SVR4 -Xc |
| 73 | -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc |
| 74 | -do |
| 75 | - CFLAGS="$ac_save_CFLAGS $ac_arg" |
| 76 | - AC_TRY_COMPILE( |
| 77 | -[#if !defined(__STDC__) || __STDC__ != 1 |
| 78 | -choke me |
| 79 | -#endif |
| 80 | -], [int test (int i, double x); |
| 81 | -struct s1 {int (*f) (int a);}; |
| 82 | -struct s2 {int (*f) (double a);};], |
| 83 | -[ac_cv_prog_cc_stdc="$ac_arg"; break]) |
| 84 | -done |
| 85 | -CFLAGS="$ac_save_CFLAGS" |
| 86 | -]) |
| 87 | -AC_MSG_RESULT($ac_cv_prog_cc_stdc) |
| 88 | -case "x$ac_cv_prog_cc_stdc" in |
| 89 | - x|xno) ;; |
| 90 | - *) CC="$CC $ac_cv_prog_cc_stdc" ;; |
| 91 | -esac |
| 92 | -]) |
| 93 | - |
| 94 | -## --------------------------------------------------------- ## |
| 95 | -## Use AC_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## |
| 96 | -## substitution. ## |
| 97 | -## --------------------------------------------------------- ## |
| 98 | - |
| 99 | -AC_DEFUN(fp_PROG_INSTALL, |
| 100 | -[AC_PROG_INSTALL |
| 101 | -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' |
| 102 | -AC_SUBST(INSTALL_SCRIPT)dnl |
| 103 | -]) |
| 104 | - |
| 105 | diff --git a/configure.in b/configure.in |
| 106 | index 6b25ed5..a6a7f5b 100644 |
| 107 | --- a/configure.in |
| 108 | +++ b/configure.in |
| 109 | @@ -103,6 +103,12 @@ nana_DEFINE(DI_MAKE_VALID_BREAKPOINT,(exprn), |
| 110 | sparc-*-*|i?86-*-*) |
| 111 | DI_MAKE_VALID_BREAKPOINT='asm("nop")' |
| 112 | ;; |
| 113 | + arm*-*-*|frv-*-*|mips*-*-*) |
| 114 | + DI_MAKE_VALID_BREAKPOINT='asm("nop")' |
| 115 | + ;; |
| 116 | + sh*-*-*) |
| 117 | + DI_MAKE_VALID_BREAKPOINT='asm("nop\n\tnop\n\t")' |
| 118 | + ;; |
| 119 | esac |
| 120 | ]) |
| 121 | |
| 122 | @@ -113,6 +119,12 @@ nana_DEFINE(DL_MAKE_VALID_BREAKPOINT,(), |
| 123 | sparc-*-*|i?86-*-*) |
| 124 | DL_MAKE_VALID_BREAKPOINT='asm("nop")' |
| 125 | ;; |
| 126 | + arm*-*-*|frv-*-*|mips*-*-*) |
| 127 | + DL_MAKE_VALID_BREAKPOINT='asm("nop")' |
| 128 | + ;; |
| 129 | + sh*-*-*) |
| 130 | + DL_MAKE_VALID_BREAKPOINT='asm("nop\n\tnop\n\t")' |
| 131 | + ;; |
| 132 | esac |
| 133 | ]) |
| 134 | |
| 135 | -- |
| 136 | 1.8.4.2 |
| 137 | |