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.136 by sf-exg, Wed Jan 18 19:44:09 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 ""
… …
32AC_AIX 32AC_AIX
33AC_GNU_SOURCE 33AC_GNU_SOURCE
34AC_ISC_POSIX 34AC_ISC_POSIX
35AC_LANG(C++) 35AC_LANG(C++)
36 36
37LINKER="$CXX"
37dnl check whether we can link with gcc -lsupc++ 38dnl check whether we can link with gcc -lsupc++
38if test x$GCC = xyes && test x$GXX = xyes; then 39if test x$GCC = xyes && test x$GXX = xyes; then
39 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it 40 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
40 AC_MSG_CHECKING([for working libsupc++]) 41 AC_MSG_CHECKING([for working libsupc++])
41 save_CXX="$CXX" 42 save_CXX="$CXX"
42 save_LIBS="$LIBS" 43 save_LIBS="$LIBS"
43 CXX="$CC" 44 CXX="$CC"
44 LIBS="$LIBS -lsupc++" 45 LIBS="$LIBS -lsupc++"
45 LINKER="$CC"
46 AC_LINK_IFELSE( 46 AC_LINK_IFELSE(
47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], 47 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
48 [AC_MSG_RESULT(ok)], 48 [AC_MSG_RESULT(ok)
49 LINKER="$CC"],
49 [ 50 [
50 AC_MSG_RESULT([no, making everything bigger and slower]) 51 AC_MSG_RESULT([no, making everything bigger and slower])
51 LIBS="$save_LIBS" 52 LIBS="$save_LIBS"
52 LINKER="$save_CXX"
53 ] 53 ]
54 ) 54 )
55 CXX="$save_CXX" 55 CXX="$save_CXX"
56fi 56fi
57AC_SUBST(LINKER,[$LINKER]) 57AC_SUBST(LINKER,[$LINKER])
… …
95support_scroll_next=yes 95support_scroll_next=yes
96support_scroll_xterm=yes 96support_scroll_xterm=yes
97support_xim=yes 97support_xim=yes
98support_pixbuf=yes 98support_pixbuf=yes
99support_startup_notification=yes 99support_startup_notification=yes
100support_afterimage=yes
101support_xft=yes 100support_xft=yes
102support_unicode3=no 101support_unicode3=no
103support_combining=yes 102support_combining=yes
104support_8bitctrls=no 103support_8bitctrls=no
105support_iso14755=yes 104support_iso14755=yes
… …
132 support_utmp=no 131 support_utmp=no
133 support_wtmp=no 132 support_wtmp=no
134 support_xim=no 133 support_xim=no
135 support_pixbuf=no 134 support_pixbuf=no
136 support_startup_notification=no 135 support_startup_notification=no
137 support_afterimage=no
138 support_xft=no 136 support_xft=no
139 support_unicode3=no 137 support_unicode3=no
140 support_combining=no 138 support_combining=no
141 support_8bitctrls=no 139 support_8bitctrls=no
142 support_iso14755=no 140 support_iso14755=no
… …
161 support_utmp=yes 159 support_utmp=yes
162 support_wtmp=yes 160 support_wtmp=yes
163 support_xim=yes 161 support_xim=yes
164 support_pixbuf=yes 162 support_pixbuf=yes
165 support_startup_notification=yes 163 support_startup_notification=yes
166 support_afterimage=yes
167 support_xft=yes 164 support_xft=yes
168 support_unicode3=yes 165 support_unicode3=yes
169 support_combining=yes 166 support_combining=yes
170 #support_8bitctrls=yes 167 #support_8bitctrls=yes
171 support_iso14755=yes 168 support_iso14755=yes
… …
173 support_perl=yes 170 support_perl=yes
174 codesets=all 171 codesets=all
175 fi 172 fi
176 ]) 173 ])
177 174
178ASSERTIONS=no 175support_assertions=no
179AC_ARG_ENABLE(assert, 176AC_ARG_ENABLE(assert,
180 [ --enable-assert enable assertions], 177 [ --enable-assert enable assertions],
181 [if test x$enableval = xyes; then 178 [if test x$enableval = xyes; then
182 ASSERTIONS=yes 179 support_assertions=yes
183 fi]) 180 fi])
184if test x$ASSERTIONS = xno; then 181if test x$support_assertions = xno; then
185 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 182 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
186fi 183fi
187 184
188WARNINGS=no 185support_warnings=no
189AC_ARG_ENABLE(warnings, 186AC_ARG_ENABLE(warnings,
190 [ --enable-warnings turn on g++ warnings], 187 [ --enable-warnings turn on g++ warnings],
191 [if test x$enableval = xyes; then 188 [if test x$enableval = xyes; then
192 WARNINGS=yes 189 support_warnings=yes
193 fi]) 190 fi])
194if test x$GXX = xyes; then 191if test x$GXX = xyes; then
195 if test $WARNINGS = yes; then 192 if test $support_warnings = yes; then
196 save_CXXFLAGS="$CXXFLAGS" 193 save_CXXFLAGS="$CXXFLAGS"
197 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 194 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
198 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 195 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
199 else 196 else
200 CXXFLAGS="$CXXFLAGS -w" 197 CXXFLAGS="$CXXFLAGS -w"
201 fi 198 fi
202fi 199fi
… …
234 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 232 support_styles=$enableval
236 fi]) 233 fi])
237 234
238AC_ARG_ENABLE(afterimage, 235AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 236 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
240 [if test x$enableval = xyes -o x$enableval = xno; then 237 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval 238 support_afterimage=$enableval
242 fi]) 239 fi])
243 240
244AC_ARG_WITH(afterimage_config, 241AC_ARG_WITH(afterimage_config,

Diff Legend

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