ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure.ac
(Generate patch)

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.131 by sf-exg, Tue Dec 13 19:13:27 2011 UTC vs.
Revision 1.140 by sf-exg, Thu Jan 19 18:17:32 2012 UTC

… …
9 9
10AC_CANONICAL_HOST 10AC_CANONICAL_HOST
11 11
12dnl RXVT version 12dnl RXVT version
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16changequote([, ])dnl 16changequote([, ])dnl
17AC_SUBST(VERSION)dnl 17AC_SUBST(VERSION)dnl
18AC_SUBST(DATE)dnl 18AC_SUBST(DATE)dnl
19 19
20echo "" 20echo ""
… …
24orig_CXXFLAGS="$CXXFLAGS" 24orig_CXXFLAGS="$CXXFLAGS"
25 25
26dnl# Checks for programs. 26dnl# Checks for programs.
27AC_PROG_CC 27AC_PROG_CC
28AC_PROG_CXX 28AC_PROG_CXX
29AC_PROG_CPP
30AC_PROG_INSTALL 29AC_PROG_INSTALL
31 30
32AC_AIX 31AC_AIX
33AC_GNU_SOURCE 32AC_GNU_SOURCE
34AC_ISC_POSIX 33AC_ISC_POSIX
35AC_LANG(C++) 34AC_LANG(C++)
36 35
36LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 37dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 38if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 40 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 41 save_CXX="$CXX"
42 save_LIBS="$LIBS" 42 save_LIBS="$LIBS"
43 CXX="$CC" 43 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 44 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 45 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 46 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 47 [AC_MSG_RESULT(ok)
48 LINKER="$CC"],
49 [ 49 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 50 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 51 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 52 ]
54 ) 53 )
55 CXX="$save_CXX" 54 CXX="$save_CXX"
56fi 55fi
57AC_SUBST(LINKER,[$LINKER]) 56AC_SUBST(LINKER,[$LINKER])
… …
66 else 65 else
67 CXXFLAGS="-O" 66 CXXFLAGS="-O"
68 fi 67 fi
69 CFLAGS="$CXXFLAGS" 68 CFLAGS="$CXXFLAGS"
70fi 69fi
71
72case $host in
73 *-*-solaris* )
74 AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
75 ;;
76esac
77 70
78dnl# FreeBSD needs to link libxpg4 71dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 72AC_SEARCH_LIBS(setlocale, xpg4)
80 73
81dnl# solaris needs to link libnsl and socket 74dnl# solaris needs to link libnsl and socket
… …
95support_scroll_next=yes 88support_scroll_next=yes
96support_scroll_xterm=yes 89support_scroll_xterm=yes
97support_xim=yes 90support_xim=yes
98support_pixbuf=yes 91support_pixbuf=yes
99support_startup_notification=yes 92support_startup_notification=yes
100support_afterimage=yes
101support_xft=yes 93support_xft=yes
102support_unicode3=no 94support_unicode3=no
103support_combining=yes 95support_combining=yes
104support_8bitctrls=no 96support_8bitctrls=no
105support_iso14755=yes 97support_iso14755=yes
… …
132 support_utmp=no 124 support_utmp=no
133 support_wtmp=no 125 support_wtmp=no
134 support_xim=no 126 support_xim=no
135 support_pixbuf=no 127 support_pixbuf=no
136 support_startup_notification=no 128 support_startup_notification=no
137 support_afterimage=no
138 support_xft=no 129 support_xft=no
139 support_unicode3=no 130 support_unicode3=no
140 support_combining=no 131 support_combining=no
141 support_8bitctrls=no 132 support_8bitctrls=no
142 support_iso14755=no 133 support_iso14755=no
… …
161 support_utmp=yes 152 support_utmp=yes
162 support_wtmp=yes 153 support_wtmp=yes
163 support_xim=yes 154 support_xim=yes
164 support_pixbuf=yes 155 support_pixbuf=yes
165 support_startup_notification=yes 156 support_startup_notification=yes
166 support_afterimage=yes
167 support_xft=yes 157 support_xft=yes
168 support_unicode3=yes 158 support_unicode3=yes
169 support_combining=yes 159 support_combining=yes
170 #support_8bitctrls=yes 160 #support_8bitctrls=yes
171 support_iso14755=yes 161 support_iso14755=yes
… …
173 support_perl=yes 163 support_perl=yes
174 codesets=all 164 codesets=all
175 fi 165 fi
176 ]) 166 ])
177 167
178ASSERTIONS=no 168support_assertions=no
179AC_ARG_ENABLE(assert, 169AC_ARG_ENABLE(assert,
180 [ --enable-assert enable assertions], 170 [ --enable-assert enable assertions],
181 [if test x$enableval = xyes; then 171 [if test x$enableval = xyes; then
182 ASSERTIONS=yes 172 support_assertions=yes
183 fi]) 173 fi])
184if test x$ASSERTIONS = xno; then 174if test x$support_assertions = xno; then
185 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 175 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
186fi 176fi
187 177
188WARNINGS=no 178support_warnings=no
189AC_ARG_ENABLE(warnings, 179AC_ARG_ENABLE(warnings,
190 [ --enable-warnings turn on g++ warnings], 180 [ --enable-warnings turn on g++ warnings],
191 [if test x$enableval = xyes; then 181 [if test x$enableval = xyes; then
192 WARNINGS=yes 182 support_warnings=yes
193 fi]) 183 fi])
194if test x$GXX = xyes; then 184if test x$GXX = xyes; then
195 if test $WARNINGS = yes; then 185 if test $support_warnings = yes; then
196 save_CXXFLAGS="$CXXFLAGS" 186 save_CXXFLAGS="$CXXFLAGS"
197 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
198 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
199 else 189 else
200 CXXFLAGS="$CXXFLAGS -w" 190 CXXFLAGS="$CXXFLAGS -w"
201 fi 191 fi
202fi 192fi
… …
234 [if test x$enableval = xyes -o x$enableval = xno; then 224 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 225 support_styles=$enableval
236 fi]) 226 fi])
237 227
238AC_ARG_ENABLE(afterimage, 228AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 229 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
240 [if test x$enableval = xyes -o x$enableval = xno; then 230 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval 231 support_afterimage=$enableval
242 fi]) 232 fi])
243 233
244AC_ARG_WITH(afterimage_config, 234AC_ARG_WITH(afterimage_config,
… …
545 sys/ioctl.h \ 535 sys/ioctl.h \
546 sys/sockio.h \ 536 sys/sockio.h \
547 sys/strredir.h \ 537 sys/strredir.h \
548 stdint.h \ 538 stdint.h \
549 wchar.h \ 539 wchar.h \
550 cwchar \
551) 540)
552 541
553AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
554[AC_COMPILE_IFELSE( 543[AC_COMPILE_IFELSE(
555 [AC_LANG_PROGRAM([ 544 [AC_LANG_PROGRAM([
… …
634 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 623 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
635fi 624fi
636LIBS=$save_LIBS 625LIBS=$save_LIBS
637CFLAGS=$save_CFLAGS 626CFLAGS=$save_CFLAGS
638 627
639AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
640[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
641if test x$rxvt_cv_func_setlocale = xyes; then
642 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
643fi
644
645AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 628AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
646[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 629[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
647if test x$rxvt_cv_func_nl_langinfo = xyes; then 630if test x$rxvt_cv_func_nl_langinfo = xyes; then
648 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 631 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
649fi 632fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines