projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
41f9f67
)
iconv: Update regarding AIX.
author
Bruno Haible
<bruno@clisp.org>
Fri, 30 Jul 2010 19:00:18 +0000
(21:00 +0200)
committer
Bruno Haible
<bruno@clisp.org>
Fri, 30 Jul 2010 19:00:18 +0000
(21:00 +0200)
ChangeLog
patch
|
blob
|
history
m4/iconv.m4
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index f533983577b91e247ea975126786ff67602b0f50..757a48a6378f9b6497939e4fdab6027ab05885ff 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,10
@@
+2010-07-30 Bruno Haible <bruno@clisp.org>
+
+ iconv: Update regarding AIX.
+ * m4/iconv.m4 (AM_ICONV_LINK): When cross-compiling, guess yes on
+ AIX 7.
+ Reported by Rainer Tammer.
+
2010-07-30 Bruno Haible <bruno@clisp.org>
getopt: Update regarding AIX.
2010-07-30 Bruno Haible <bruno@clisp.org>
getopt: Update regarding AIX.
diff --git
a/m4/iconv.m4
b/m4/iconv.m4
index e2041b9b49fb70bcb08cd65699529d9b0c3374a4..f3c2ce868e6f67ed831fee85d6186ab073df0b16 100644
(file)
--- a/
m4/iconv.m4
+++ b/
m4/iconv.m4
@@
-1,4
+1,4
@@
-# iconv.m4 serial 11
(gettext-0.18.1)
+# iconv.m4 serial 11
a
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@
-139,10
+139,14
@@
int main ()
return 1;
return 0;
}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
return 1;
return 0;
}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
- [case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac])
+ [
+changequote(,)dnl
+ case "$host_os" in
+ aix | aix[3-6]* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+changequote([,])dnl
+ ])
LIBS="$am_save_LIBS"
])
case "$am_cv_func_iconv_works" in
LIBS="$am_save_LIBS"
])
case "$am_cv_func_iconv_works" in