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.133 by sf-exg, Wed Dec 14 13:34:20 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
… …
189 support_warnings=yes 182 support_warnings=yes
190 fi]) 183 fi])
191if test x$GXX = xyes; then 184if test x$GXX = xyes; then
192 if test $support_warnings = yes; then 185 if test $support_warnings = yes; then
193 save_CXXFLAGS="$CXXFLAGS" 186 save_CXXFLAGS="$CXXFLAGS"
194 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" 187 CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value"
195 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) 188 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
196 else 189 else
197 CXXFLAGS="$CXXFLAGS -w" 190 CXXFLAGS="$CXXFLAGS -w"
198 fi 191 fi
199fi 192fi
… …
542 sys/ioctl.h \ 535 sys/ioctl.h \
543 sys/sockio.h \ 536 sys/sockio.h \
544 sys/strredir.h \ 537 sys/strredir.h \
545 stdint.h \ 538 stdint.h \
546 wchar.h \ 539 wchar.h \
547 cwchar \
548) 540)
549 541
550AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, 542AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
551[AC_COMPILE_IFELSE( 543[AC_COMPILE_IFELSE(
552 [AC_LANG_PROGRAM([ 544 [AC_LANG_PROGRAM([
… …
631 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)
632fi 624fi
633LIBS=$save_LIBS 625LIBS=$save_LIBS
634CFLAGS=$save_CFLAGS 626CFLAGS=$save_CFLAGS
635 627
636AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
637[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
638if test x$rxvt_cv_func_setlocale = xyes; then
639 AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
640fi
641
642AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 628AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
643[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])])
644if test x$rxvt_cv_func_nl_langinfo = xyes; then 630if test x$rxvt_cv_func_nl_langinfo = xyes; then
645 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)
646fi 632fi

Diff Legend

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