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.76 by ayin, Tue Sep 18 12:17:58 2007 UTC vs.
Revision 1.85 by root, Mon Nov 26 20:07:49 2007 UTC

… …
17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl 20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 21AC_SUBST(LIBVERSION)dnl
22
22echo "" 23echo ""
23echo "configuring for rxvt $VERSION" 24echo "configuring for rxvt $VERSION"
24echo "" 25echo ""
25 26
26orig_CXXFLAGS="$CXXFLAGS" 27orig_CXXFLAGS="$CXXFLAGS"
… …
62dnl# -------------------------------------------------------------------------- 63dnl# --------------------------------------------------------------------------
63dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 64dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64dnl# 65dnl#
65if test -z "$orig_CXXFLAGS"; then 66if test -z "$orig_CXXFLAGS"; then
66 if test x$GCC = xyes && test "x$GXX" = xyes; then 67 if test x$GCC = xyes && test "x$GXX" = xyes; then
67 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 68 CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
68 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) 69 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
69 else 70 else
70 CXXFLAGS="-O" 71 CXXFLAGS="-O"
71 fi 72 fi
72 CFLAGS="$CXXFLAGS" 73 CFLAGS="$CXXFLAGS"
… …
193 support_perl=yes 194 support_perl=yes
194 codesets=all 195 codesets=all
195 fi 196 fi
196 ]) 197 ])
197 198
199WARNINGS=no
200AC_ARG_ENABLE(warnings,
201 [ --enable-warnings turn on g++ warnings],
202 [if test x$enableval = xyes; then
203 WARNINGS=yes
204 fi])
205if test x$GXX = xyes; then
206 if test $WARNINGS = yes; then
207 save_CXXFLAGS="$CXXFLAGS"
208 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
209 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
210 else
211 CXXFLAGS="$CXXFLAGS -w"
212 fi
213fi
214
198AC_ARG_ENABLE(unicode3, 215AC_ARG_ENABLE(unicode3,
199 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], 216 [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
200 [if test x$enableval = xyes -o x$enableval = xno; then 217 [if test x$enableval = xyes -o x$enableval = xno; then
201 support_unicode3=$enableval 218 support_unicode3=$enableval
202 fi]) 219 fi])
… …
278 [if test x$enableval = xyes -o x$enableval = xno; then 295 [if test x$enableval = xyes -o x$enableval = xno; then
279 support_scroll_plain=$enableval 296 support_scroll_plain=$enableval
280 fi]) 297 fi])
281 298
282AC_ARG_WITH(codesets, 299AC_ARG_WITH(codesets,
283 [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], 300 [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
284 [codesets="$withval"]) 301 [codesets="$withval"])
285 302
286AC_ARG_ENABLE(xim, 303AC_ARG_ENABLE(xim,
287 [ --enable-xim XIM (X Input Method) protocol support], 304 [ --enable-xim XIM (X Input Method) protocol support],
288 [if test x$enableval = xyes -o x$enableval = xno; then 305 [if test x$enableval = xyes -o x$enableval = xno; then
… …
313 support_8bitctrls=$enableval 330 support_8bitctrls=$enableval
314 fi]) 331 fi])
315 332
316RESFALLBACK=Rxvt 333RESFALLBACK=Rxvt
317AC_ARG_ENABLE(fallback, 334AC_ARG_ENABLE(fallback,
318 [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], 335 [ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
319 [ 336 [
320 test x$enableval = xyes && enableval=Rxvt 337 test x$enableval = xyes && enableval=Rxvt
321 test x$enableval = xno && enableval= 338 test x$enableval = xno && enableval=
322 RESFALLBACK="$enableval" 339 RESFALLBACK="$enableval"
323 ]) 340 ])
… …
382 [if test x$enableval = xyes -o x$enableval = xno; then 399 [if test x$enableval = xyes -o x$enableval = xno; then
383 support_mousewheel=$enableval 400 support_mousewheel=$enableval
384 fi]) 401 fi])
385 402
386AC_ARG_ENABLE(slipwheeling, 403AC_ARG_ENABLE(slipwheeling,
387 [ --enable-slipwheeling enable slip wheel scrolling (requires previous)], 404 [ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
388 [if test x$enableval = xyes -o x$enableval = xno; then 405 [if test x$enableval = xyes -o x$enableval = xno; then
389 support_mouseslipwheel=$enableval 406 support_mouseslipwheel=$enableval
390 fi]) 407 fi])
391 408
392AC_ARG_ENABLE(smart-resize, 409AC_ARG_ENABLE(smart-resize,
… …
416AC_ARG_WITH(terminfo, 433AC_ARG_WITH(terminfo,
417 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 434 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
418 [if test x$withval != x; then 435 [if test x$withval != x; then
419 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 436 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
420 fi]) 437 fi])
438
439dnl# --------------------------------------------------------------------------
440
441LIBEV_M4_AVOID_LIBRT=1
442m4_include([libev/libev.m4])
421 443
422dnl# -------------------------------------------------------------------------- 444dnl# --------------------------------------------------------------------------
423 445
424AC_PATH_PROG(TIC, tic, :) 446AC_PATH_PROG(TIC, tic, :)
425 447
… …
626dnl# CHECKING FOR LIBRARY FUNCTIONS 648dnl# CHECKING FOR LIBRARY FUNCTIONS
627dnl# -------------------------------------------------------------------------- 649dnl# --------------------------------------------------------------------------
628AC_TYPE_SIGNAL 650AC_TYPE_SIGNAL
629dnl> AC_FUNC_VPRINTF 651dnl> AC_FUNC_VPRINTF
630 652
631AC_CHECK_FUNCS( \ 653AC_CHECK_FUNCS(unsetenv)
632 unsetenv \
633 setutent \
634 on_exit \
635)
636 654
637UTMP_CHECK 655UTMP_CHECK
638 656
639dnl# -------------------------------------------------------------------------- 657dnl# --------------------------------------------------------------------------
640 658
641dnl# find ttys/ttytab
642AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
643[for ttys_file in dnl
644 /etc/ttys /etc/ttytab;
645do
646 if test -f "$ttys_file" ; then
647 rxvt_cv_path_ttytab=$ttys_file
648 break
649 fi
650done
651])
652if test x$rxvt_cv_path_ttytab != x; then
653 AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
654fi
655
656dnl# -------------------------------------------------------------------------- 659dnl# --------------------------------------------------------------------------
657dnl# -------------------------------------------------------------------------- 660dnl# --------------------------------------------------------------------------
658 661
659dnl# this is a really hack test for some basic Xlocale stuff 662dnl# this is a really hack test for some basic Xlocale stuff
660ac_save_LIBS=$LIBS 663save_LIBS=$LIBS
661ac_save_CFLAGS=$CFLAGS 664save_CFLAGS=$CFLAGS
662CFLAGS="$CFLAGS $X_CFLAGS" 665CFLAGS="$CFLAGS $X_CFLAGS"
663LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 666LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
664if test x$support_xim = xyes; then 667if test x$support_xim = xyes; then
665 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 668 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
666 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 669 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
… …
697[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 700[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
698#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 701#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
699if test x$rxvt_cv_func_xsetlocale = xyes; then 702if test x$rxvt_cv_func_xsetlocale = xyes; then
700 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 703 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
701fi 704fi
702LIBS=$ac_save_LIBS 705LIBS=$save_LIBS
703CFLAGS=$ac_save_CFLAGS 706CFLAGS=$save_CFLAGS
704 707
705AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, 708AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
706[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) 709[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
707if test x$rxvt_cv_func_setlocale = xyes; then 710if test x$rxvt_cv_func_setlocale = xyes; then
708 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) 711 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
… …
724dnl# now add and remove other stuff 727dnl# now add and remove other stuff
725dnl# -------------------------------------------------------------------------- 728dnl# --------------------------------------------------------------------------
726if test x$support_xft = xyes; then 729if test x$support_xft = xyes; then
727 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 730 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
728 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 731 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
729 LIBS="$LIBS `$PKG_CONFIG xft --libs`" 732 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
730 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 733 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
731 else 734 else
732 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 735 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
733 if test $XFT_CONFIG != no; then 736 if test $XFT_CONFIG != no; then
734 LIBS="$LIBS `$XFT_CONFIG --libs`" 737 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
735 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 738 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
736 fi 739 fi
737 fi 740 fi
738 741
742 save_LIBS="$LIBS"
743 LIBS="$LIBS $X_LIBS"
739 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 744 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
740 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 745 AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
746 LIBS="$save_LIBS"
741 747
742 if test x$support_xft = xyes; then 748 if test x$support_xft = xyes; then
743 AC_DEFINE(XFT, 1, Define to enable xft support) 749 AC_DEFINE(XFT, 1, Define to enable xft support)
744 fi 750 fi
745fi 751fi

Diff Legend

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