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

Comparing cvsroot/rxvt-unicode/configure.ac (file contents):
Revision 1.15 by ayin, Sat Jan 21 18:15:07 2006 UTC vs.
Revision 1.18 by ayin, Sat Jan 21 22:32:29 2006 UTC

… …
33AC_PROG_CPP 33AC_PROG_CPP
34AC_PROG_INSTALL 34AC_PROG_INSTALL
35 35
36AC_AIX 36AC_AIX
37AC_ISC_POSIX 37AC_ISC_POSIX
38
39AC_LANG(C) 38AC_LANG(C++)
40 39
41dnl check wetehr we can link with gcc -lsupc++ 40dnl check wether we can link with gcc -lsupc++
42LINKER="$CXX"
43if test x$GCC = xyes && test x$GXX = xyes; then 41if test x$GCC = xyes && test x$GXX = xyes; then
44 AC_CHECK_LIB(supc++, main, [ 42 dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
45 LINKER="$CC" 43 AC_MSG_CHECKING([for working libsupc++])
44 save_CXX="$CXX"
45 save_LIBS="$LIBS"
46 CXX="$CC"
46 LIBS="$LIBS -lsupc++" 47 LIBS="$LIBS -lsupc++"
48 LINKER="$CC"
49 AC_LINK_IFELSE(
50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])],
51 [AC_MSG_RESULT(ok)],
52 [
53 AC_MSG_RESULT([no, making everything bigger and slower])
54 LIBS="$save_LIBS"
55 LINKER="$save_CXX"
56 ]
47 ]) 57 )
58 CXX="$save_CXX"
48fi 59fi
49AC_SUBST(LINKER,[$LINKER]) 60AC_SUBST(LINKER,[$LINKER])
50 61
51AC_LANG(C++) 62AC_LANG(C++)
52dnl# -------------------------------------------------------------------------- 63dnl# --------------------------------------------------------------------------
… …
772 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 783 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
773fi 784fi
774 785
775AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds, 786AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds,
776[AC_TRY_LINK([ 787[AC_TRY_LINK([
788#include <cstddef> // broken bsds (is that redundant) need this
777#include <sys/types.h> 789#include <sys/types.h>
778#include <sys/socket.h> 790#include <sys/socket.h>
791#include <sys/uio.h>
779],[ 792],[
780{ 793{
781 msghdr msg; 794 msghdr msg;
782 iovec iov; 795 iovec iov;
783 char buf [100]; 796 char buf [100];
… …
827 840
828dnl# -------------------------------------------------------------------------- 841dnl# --------------------------------------------------------------------------
829dnl# now add and remove other stuff 842dnl# now add and remove other stuff
830dnl# -------------------------------------------------------------------------- 843dnl# --------------------------------------------------------------------------
831if test x$support_xft = xyes; then 844if test x$support_xft = xyes; then
832 LIBS="$LIBS `pkg-config xft --libs`" 845 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
846 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
847 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
848 LIBS="$LIBS `$PKG_CONFIG xft --libs`"
833 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" 849 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
850 else
851 if test $XFT_CONFIG != no; then
852 LIBS="$LIBS `$XFT_CONFIG --libs`"
853 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
854 fi
855 fi
834 856
835 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 857 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
836 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 858 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
837 859
838 if test x$support_xft = xyes; then 860 if test x$support_xft = xyes; then

Diff Legend

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