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.130 by mikachu, Sun Nov 13 16:03:31 2011 UTC vs.
Revision 1.137 by sf-exg, Thu Jan 19 11:08:19 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])
… …
66 else 66 else
67 CXXFLAGS="-O" 67 CXXFLAGS="-O"
68 fi 68 fi
69 CFLAGS="$CXXFLAGS" 69 CFLAGS="$CXXFLAGS"
70fi 70fi
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 71
78dnl# FreeBSD needs to link libxpg4 72dnl# FreeBSD needs to link libxpg4
79AC_SEARCH_LIBS(setlocale, xpg4) 73AC_SEARCH_LIBS(setlocale, xpg4)
80 74
81dnl# solaris needs to link libnsl and socket 75dnl# solaris needs to link libnsl and socket
… …
95support_scroll_next=yes 89support_scroll_next=yes
96support_scroll_xterm=yes 90support_scroll_xterm=yes
97support_xim=yes 91support_xim=yes
98support_pixbuf=yes 92support_pixbuf=yes
99support_startup_notification=yes 93support_startup_notification=yes
100support_afterimage=yes
101support_xft=yes 94support_xft=yes
102support_unicode3=no 95support_unicode3=no
103support_combining=yes 96support_combining=yes
104support_8bitctrls=no 97support_8bitctrls=no
105support_iso14755=yes 98support_iso14755=yes
… …
132 support_utmp=no 125 support_utmp=no
133 support_wtmp=no 126 support_wtmp=no
134 support_xim=no 127 support_xim=no
135 support_pixbuf=no 128 support_pixbuf=no
136 support_startup_notification=no 129 support_startup_notification=no
137 support_afterimage=no
138 support_xft=no 130 support_xft=no
139 support_unicode3=no 131 support_unicode3=no
140 support_combining=no 132 support_combining=no
141 support_8bitctrls=no 133 support_8bitctrls=no
142 support_iso14755=no 134 support_iso14755=no
… …
161 support_utmp=yes 153 support_utmp=yes
162 support_wtmp=yes 154 support_wtmp=yes
163 support_xim=yes 155 support_xim=yes
164 support_pixbuf=yes 156 support_pixbuf=yes
165 support_startup_notification=yes 157 support_startup_notification=yes
166 support_afterimage=yes
167 support_xft=yes 158 support_xft=yes
168 support_unicode3=yes 159 support_unicode3=yes
169 support_combining=yes 160 support_combining=yes
170 #support_8bitctrls=yes 161 #support_8bitctrls=yes
171 support_iso14755=yes 162 support_iso14755=yes
… …
173 support_perl=yes 164 support_perl=yes
174 codesets=all 165 codesets=all
175 fi 166 fi
176 ]) 167 ])
177 168
178ASSERTIONS=no 169support_assertions=no
179AC_ARG_ENABLE(assert, 170AC_ARG_ENABLE(assert,
180 [ --enable-assert enable assertions], 171 [ --enable-assert enable assertions],
181 [if test x$enableval = xyes; then 172 [if test x$enableval = xyes; then
182 ASSERTIONS=yes 173 support_assertions=yes
183 fi]) 174 fi])
184if test x$ASSERTIONS = xno; then 175if test x$support_assertions = xno; then
185 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) 176 AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
186fi 177fi
187 178
188WARNINGS=no 179support_warnings=no
189AC_ARG_ENABLE(warnings, 180AC_ARG_ENABLE(warnings,
190 [ --enable-warnings turn on g++ warnings], 181 [ --enable-warnings turn on g++ warnings],
191 [if test x$enableval = xyes; then 182 [if test x$enableval = xyes; then
192 WARNINGS=yes 183 support_warnings=yes
193 fi]) 184 fi])
194if test x$GXX = xyes; then 185if test x$GXX = xyes; then
195 if test $WARNINGS = yes; then 186 if test $support_warnings = yes; then
196 save_CXXFLAGS="$CXXFLAGS" 187 save_CXXFLAGS="$CXXFLAGS"
197 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 188 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
198 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 189 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
199 else 190 else
200 CXXFLAGS="$CXXFLAGS -w" 191 CXXFLAGS="$CXXFLAGS -w"
201 fi 192 fi
202fi 193fi
… …
234 [if test x$enableval = xyes -o x$enableval = xno; then 225 [if test x$enableval = xyes -o x$enableval = xno; then
235 support_styles=$enableval 226 support_styles=$enableval
236 fi]) 227 fi])
237 228
238AC_ARG_ENABLE(afterimage, 229AC_ARG_ENABLE(afterimage,
239 [ --enable-afterimage enable integration with libAfterImage for background images], 230 [ --enable-afterimage enable integration with libAfterImage for background images (deprecated)],
240 [if test x$enableval = xyes -o x$enableval = xno; then 231 [if test x$enableval = xyes -o x$enableval = xno; then
241 support_afterimage=$enableval 232 support_afterimage=$enableval
242 fi]) 233 fi])
243 234
244AC_ARG_WITH(afterimage_config, 235AC_ARG_WITH(afterimage_config,
… …
498AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 489AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
499AC_SUBST(STARTUP_NOTIFICATION_LIBS) 490AC_SUBST(STARTUP_NOTIFICATION_LIBS)
500 491
501AFTERIMAGE_CFLAGS= 492AFTERIMAGE_CFLAGS=
502AFTERIMAGE_LIBS= 493AFTERIMAGE_LIBS=
503AFTERIMAGE_VERSION=
504 494
505if test x$support_afterimage = xyes; then 495if test x$support_afterimage = xyes; then
506 support_afterimage=no 496 support_afterimage=no
507 497
508 if test "x$afterimage_config" = "x" ; then 498 if test "x$afterimage_config" = "x" ; then
509 AC_PATH_PROG(afterimage_config, afterimage-config, no) 499 AC_PATH_PROG(afterimage_config, afterimage-config, no)
510 fi 500 fi
511 if test "x$afterimage_config" != "xno" ; then 501 if test "x$afterimage_config" != "xno" ; then
512 AC_MSG_CHECKING(for libAfterImage version >= 1.15) 502 AC_MSG_CHECKING(for libAfterImage version >= 1.15)
513 xAFTERIMAGE_VERSION=`$afterimage_config --version` 503 AFTERIMAGE_VERSION=`$afterimage_config --version`
514 if test -n "$xAFTERIMAGE_VERSION" ; then 504 if test -n "$AFTERIMAGE_VERSION" ; then
515 xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` 505 AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
516 xAFTERIMAGE_LIBS=`$afterimage_config --libs` 506 AFTERIMAGE_LIBS=`$afterimage_config --libs`
517 if test "x$xAFTERIMAGE_LIBS" != "x"; then 507 if test "x$AFTERIMAGE_LIBS" != "x"; then
518 libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` 508 libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
519 libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` 509 libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
520 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then 510 if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
521 support_afterimage=yes 511 support_afterimage=yes
522 AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
523 AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
524 AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
525 fi 512 fi
526 fi 513 fi
527 fi 514 fi
528 if test "x$support_afterimage" = "xyes"; then 515 if test "x$support_afterimage" = "xyes"; then
529 AC_MSG_RESULT($AFTERIMAGE_LIBS) 516 AC_MSG_RESULT($AFTERIMAGE_LIBS)
530 image_lib=libafterimage 517 image_lib=libafterimage
531 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) 518 AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
532 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) 519 AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
533 else 520 else
534 AC_MSG_RESULT(no) 521 AC_MSG_RESULT(no)
522 AFTERIMAGE_CFLAGS=
523 AFTERIMAGE_LIBS=
535 fi 524 fi
536 fi 525 fi
537fi 526fi
538 527
539AC_SUBST(AFTERIMAGE_CFLAGS) 528AC_SUBST(AFTERIMAGE_CFLAGS)

Diff Legend

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