← Back to branch summary

~ubuntu-branches/ubuntu/utopic/coreutils/utopic-proposed

« back to all changes in this revision

Viewing changes to m4/strstr.m4

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-11-28 03:03:42 UTC
  • mfrom: (8.3.4 sid)
  • Revision ID: package-import@ubuntu.com-20121128030342-21zanj8354gas5gr
Tags: 8.20-3ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Make 'uname -i -p' return the real processor/hardware, instead of
    unknown.
  - Build-depend on gettext:any instead of on gettext, so that apt-get can
    properly resolve build-dependencies on the tool when cross-building.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/strstr.m4
1
 
# strstr.m4 serial 15
2
 
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
1
# strstr.m4 serial 16
 
2
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
3
3
dnl This file is free software; the Free Software Foundation
4
4
dnl gives unlimited permission to copy and/or distribute it,
5
5
dnl with or without modifications, as long as this notice is preserved.
46
46
  Lucky user
47
47
#endif
48
48
           ],
49
 
           [gl_cv_func_strstr_works_always=yes],
 
49
           [gl_cv_func_strstr_works_always="guessing yes"],
50
50
           [gl_cv_func_strstr_works_always="guessing no"])
51
51
        ])
52
52
      ])
53
 
    if test "$gl_cv_func_strstr_works_always" != yes; then
54
 
      REPLACE_STRSTR=1
55
 
    fi
 
53
    case "$gl_cv_func_strstr_works_always" in
 
54
      *yes) ;;
 
55
      *)
 
56
        REPLACE_STRSTR=1
 
57
        ;;
 
58
    esac
56
59
  fi
57
60
]) # gl_FUNC_STRSTR_SIMPLE
58
61
 
113
116
 #endif
114
117
#endif
115
118
           ],
116
 
           [gl_cv_func_strstr_linear=yes],
 
119
           [gl_cv_func_strstr_linear="guessing yes"],
117
120
           [gl_cv_func_strstr_linear="guessing no"])
118
121
        ])
119
122
      ])
120
 
    if test "$gl_cv_func_strstr_linear" != yes; then
121
 
      REPLACE_STRSTR=1
122
 
    fi
 
123
    case "$gl_cv_func_strstr_linear" in
 
124
      *yes) ;;
 
125
      *)
 
126
        REPLACE_STRSTR=1
 
127
        ;;
 
128
    esac
123
129
  fi
124
130
]) # gl_FUNC_STRSTR