Mercurial > ~mikael > mcabber > hg
comparison mcabber/configure.ac @ 1382:1447c5296977
Fix locale charset detection on some BSD systems
Tested on OpenBSD 4.2
If possible, use locale_charset() in place of nl_langinfo().
This patch also reverts the minor datadir change from last changeset
as it doesn't solve the problem.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 02 Dec 2007 13:04:57 +0100 |
parents | 40095d413da9 |
children | 8e763c2c331f |
comparison
equal
deleted
inserted
replaced
1381:40095d413da9 | 1382:1447c5296977 |
---|---|
31 | 31 |
32 # Checks for header files. | 32 # Checks for header files. |
33 AC_HEADER_STDC | 33 AC_HEADER_STDC |
34 AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h stddef.h \ | 34 AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h stddef.h \ |
35 stdlib.h string.h strings.h sys/socket.h sys/time.h \ | 35 stdlib.h string.h strings.h sys/socket.h sys/time.h \ |
36 syslog.h termios.h unistd.h getopt.h wchar.h wctype.h]) | 36 syslog.h termios.h unistd.h getopt.h wchar.h wctype.h \ |
37 localcharset.h]) | |
37 AC_CHECK_HEADERS([getopt.h], , AC_MSG_ERROR([Missing header file])) | 38 AC_CHECK_HEADERS([getopt.h], , AC_MSG_ERROR([Missing header file])) |
38 AC_VAR_TIMEZONE_EXTERNALS | 39 AC_VAR_TIMEZONE_EXTERNALS |
39 | 40 |
40 # Checks for typedefs, structures, and compiler characteristics. | 41 # Checks for typedefs, structures, and compiler characteristics. |
41 AC_HEADER_STDBOOL | 42 AC_HEADER_STDBOOL |
187 | 188 |
188 AC_DEFINE(BUILD_JABBER, 1, [build with jabber support]) | 189 AC_DEFINE(BUILD_JABBER, 1, [build with jabber support]) |
189 | 190 |
190 # Export $datadir to the source tree. | 191 # Export $datadir to the source tree. |
191 if test x"${datadir}" != x""; then | 192 if test x"${datadir}" != x""; then |
192 AC_DEFINE_DIR(DATA_DIR, "$datadir", [Data files directory]) | 193 AC_DEFINE_DIR(DATA_DIR, "${datadir}", [Data files directory]) |
193 fi | 194 fi |
194 | 195 |
195 AC_ARG_ENABLE(debug, | 196 AC_ARG_ENABLE(debug, |
196 [AC_HELP_STRING(--enable-debug, Add development compilation options)], | 197 [AC_HELP_STRING(--enable-debug, Add development compilation options)], |
197 debug=$enableval, debug="") | 198 debug=$enableval, debug="") |