org.handhelds.familiar/packages/tin/tin-1.7.3/configure.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- tin-1.7.3/configure.in~configure
   7 +++ tin-1.7.3/configure.in
   8 @@ -34,8 +34,9 @@
   9  dnl
  10  dnl Process this file with autoconf to produce a configure script.
  11
  12 -AC_PREREQ(2.13.20020210)
  13 -AC_INIT(include/tin.h)
  14 +AC_PREREQ(2.57)
  15 +AC_INIT
  16 +AC_CONFIG_SRCDIR([include/tin.h])
  17  AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin)
  18  AC_PREFIX_DEFAULT(/usr/local)
  19
  20 @@ -406,7 +407,7 @@
  21                 CF_NCURSES_LIBS(ncursesw)
  22                 CF_NCURSES_VERSION
  23                 CF_XOPEN_CURSES
  24 -               test "$cf_cv_need_xopen_extension" = unknown && AC_ERROR(X/Open curses not found)
  25 +               test "$cf_cv_need_xopen_extension" = unknown && AC_MSG_ERROR([X/Open curses not found])
  26                 ;;
  27         curses) #(vi
  28                 CF_CURSES_CPPFLAGS
  29 @@ -432,25 +433,25 @@
  30  fi
  31
  32  ## debugging libraries (do this after other libraries)
  33 -AC_MSG_CHECKING(if you want dbmalloc library)
  34 +AC_MSG_CHECKING([if you want dbmalloc library])
  35  debug_malloc=none
  36 -AC_ARG_WITH(dbmalloc,
  37 +AC_ARG_WITH([dbmalloc],
  38         [  --with-dbmalloc         use Conor Cahill's dbmalloc library],
  39 -       [AC_MSG_RESULT(yes)
  40 -        AC_CHECK_LIB(dbmalloc,debug_malloc,
  41 -        AC_CHECK_HEADER(dbmalloc.h,debug_malloc=DBMALLOC))],
  42 -       AC_MSG_RESULT(no))
  43 +       [AC_MSG_RESULT([yes])
  44 +        AC_CHECK_LIB([dbmalloc],[debug_malloc],[
  45 +        AC_CHECK_HEADER([dbmalloc.h],[debug_malloc=DBMALLOC])])],
  46 +       AC_MSG_RESULT([no]))
  47
  48 -AC_MSG_CHECKING(if you want dmalloc library)
  49 -AC_ARG_WITH(dmalloc,
  50 +AC_MSG_CHECKING([if you want dmalloc library])
  51 +AC_ARG_WITH([dmalloc],
  52         [  --with-dmalloc          use Gray Watson's dmalloc library],
  53         [AC_MSG_RESULT(yes)
  54 -        AC_CHECK_LIB(dmalloc,dmalloc_debug,
  55 -        AC_CHECK_HEADER(dmalloc.h,debug_malloc=DMALLOC))],
  56 +        AC_CHECK_LIB([dmalloc],[dmalloc_debug],[
  57 +        AC_CHECK_HEADER([dmalloc.h],[debug_malloc=DMALLOC])])],
  58         AC_MSG_RESULT(no))
  59
  60 -AC_MSG_CHECKING(if you want debugging-trace)
  61 -AC_ARG_WITH(trace,
  62 +AC_MSG_CHECKING([if you want debugging-trace])
  63 +AC_ARG_WITH([trace],
  64         [  --with-trace            use debugging/traces],
  65         [use_trace=yes],
  66         [use_trace=no])
  67 @@ -667,7 +668,7 @@
  68
  69  ### checks for compiler characteristics
  70  CF_MAKEFLAGS
  71 -AC_LANG_C
  72 +AC_LANG([C])
  73  AC_C_CONST
  74  AC_C_INLINE
  75  CF_CPP_EXPANDS
  76 @@ -763,14 +764,13 @@
  77
  78  dnl test to see if quad_t is defined
  79  AC_MSG_CHECKING(for quad_t)
  80 -AC_TRY_COMPILE([
  81 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  82  #include <sys/types.h>
  83  #if 0
  84  #include <stdlib.h>
  85  #include <stddef.h>
  86  #endif /* 0 */
  87 -],[quad_t x; x = 0],
  88 -ac_cv_quad_t=yes, ac_cv_quad_t=no)
  89 +]], [[quad_t x; x = 0]])],[ac_cv_quad_t=yes],[ac_cv_quad_t=no])
  90  AC_MSG_RESULT($ac_cv_quad_t)
  91  if test $ac_cv_quad_t = yes; then
  92         AC_DEFINE(HAVE_QUAD_T)
  93 @@ -778,10 +778,9 @@
  94
  95  dnl test to see if long long is defined
  96  AC_MSG_CHECKING(for long long)
  97 -AC_TRY_COMPILE([
  98 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  99  #include <sys/types.h>
 100 -],[long long x; x = 0],
 101 -ac_cv_long_long=yes, ac_cv_long_long=no)
 102 +]], [[long long x; x = 0]])],[ac_cv_long_long=yes],[ac_cv_long_long=no])
 103  AC_MSG_RESULT($ac_cv_long_long)
 104  if test $ac_cv_long_long = yes; then
 105         AC_DEFINE(HAVE_LONG_LONG)
 106 @@ -789,7 +788,7 @@
 107
 108  dnl test to see if nl_item is defined
 109  AC_MSG_CHECKING(for nl_item)
 110 -AC_TRY_COMPILE([
 111 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 112  #ifdef HAVE_LANGINFO_H
 113  #include <langinfo.h>
 114  #else
 115 @@ -797,8 +796,7 @@
 116  #include <nl_types.h>
 117  #endif
 118  #endif
 119 -],[nl_item x; x = 0],
 120 -ac_cv_nl_item=yes, ac_cv_nl_item=no)
 121 +]], [[nl_item x; x = 0]])],[ac_cv_nl_item=yes],[ac_cv_nl_item=no])
 122  AC_MSG_RESULT($ac_cv_nl_item)
 123  if test $ac_cv_nl_item = yes; then
 124          AC_DEFINE(HAVE_NL_ITEM)
 125 @@ -845,14 +843,13 @@
 126                 cf_save_LIBS="$LIBS"
 127                 cf_try_icuuc="no"
 128                 LIBS="$LIBS -licuuc"
 129 -               AC_TRY_LINK([#include <unicode/unorm.h>], [
 130 +               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unicode/unorm.h>]], [[
 131                         int32_t needed, ustr = NULL;
 132                         UErrorCode status;
 133 -                       needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [
 134 +                       needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);]])],[
 135                         AC_DEFINE(HAVE_LIBICUUC)
 136 -                       cf_try_icuuc="yes"],
 137 -                       LIBS=$cf_save_LIBS
 138 -               )
 139 +                       cf_try_icuuc="yes"],[LIBS=$cf_save_LIBS
 140 +               ])
 141                 AC_MSG_RESULT($cf_try_icuuc)
 142         ])
 143  ])
 144 @@ -866,15 +863,13 @@
 145         AC_MSG_CHECKING(if we should include termcap.h)
 146         cf_save_CFLAGS="$CFLAGS"
 147         CFLAGS="$CFLAGS -I$srcdir/include"
 148 -       AC_TRY_COMPILE([
 149 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 150  #define HAVE_TERMCAP_H 1
 151 -#include <tcurses.h>],[
 152 +#include <tcurses.h>]], [[
 153  #ifdef NCURSES_VERSION
 154  make an error
 155  #endif
 156 -],
 157 -               [cf_result=yes],
 158 -               [cf_result=no])
 159 +]])],[cf_result=yes],[cf_result=no])
 160         AC_MSG_RESULT($cf_result)
 161         CFLAGS="$cf_save_CFLAGS"
 162         test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H)
 163 @@ -889,8 +884,7 @@
 164         cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag"
 165  elif test ".$cf_cv_termlib" = .termcap ; then
 166         # BSD 'tputs()' may need 'PC' to be set.
 167 -       AC_TRY_LINK([],[extern char PC; PC = 0],
 168 -               [AC_DEFINE(HAVE_EXTERN_TCAP_PC)])
 169 +       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char PC; PC = 0]])],[AC_DEFINE(HAVE_EXTERN_TCAP_PC)],[])
 170         cf_tc_funcs="tgetint tgetnum tparam tparm"
 171         cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag"
 172  fi
 173 @@ -1172,7 +1166,7 @@
 174
 175  CF_CHECK_HEADERS(iconv.h)
 176  AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension)
 177 -AC_TRY_RUN([
 178 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
 179  #ifdef HAVE_ICONV_H
 180  #      include <iconv.h>
 181  #endif /* HAVE_ICONV_H */
 182 @@ -1185,11 +1179,8 @@
 183         if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1))
 184                 exit(1);
 185         exit(0);
 186 -}],
 187 -       AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes),
 188 -       AC_MSG_RESULT(no),
 189 -       AC_MSG_RESULT(unknown)
 190 -)
 191 +}]])],[AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(unknown)
 192 +])
 193
 194
 195  # tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test
 196 @@ -1223,6 +1214,7 @@
 197  CF_DEFINE_STRING(TIN_LDFLAGS,  "$LDFLAGS")
 198  CF_DEFINE_STRING(TIN_LIBS,     "$LIBS")
 199
 200 -AC_OUTPUT($PCRE_MAKEFILE
 201 +AC_CONFIG_FILES([$PCRE_MAKEFILE
 202         $SUB_MAKEFILE
 203 -       src/Makefile)
 204 +       src/Makefile])
 205 +AC_OUTPUT