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.16 by root, Sat Jan 21 19:50:53 2006 UTC vs.
Revision 1.19 by ayin, Sat Jan 21 23:07:38 2006 UTC

… …
48 LINKER="$CC" 48 LINKER="$CC"
49 AC_LINK_IFELSE( 49 AC_LINK_IFELSE(
50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])], 50 [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])],
51 [AC_MSG_RESULT(ok)], 51 [AC_MSG_RESULT(ok)],
52 [ 52 [
53 AC_MSG_RESULT([no, make everything bigger and slower]) 53 AC_MSG_RESULT([no, making everything bigger and slower])
54 CXX="$save_CXX"
55 LIBS="$save_LIBS" 54 LIBS="$save_LIBS"
56 LINKER="$CXX" 55 LINKER="$save_CXX"
57 ] 56 ]
58 ) 57 )
58 CXX="$save_CXX"
59fi 59fi
60AC_SUBST(LINKER,[$LINKER]) 60AC_SUBST(LINKER,[$LINKER])
61 61
62AC_LANG(C++) 62AC_LANG(C++)
63dnl# -------------------------------------------------------------------------- 63dnl# --------------------------------------------------------------------------
… …
781[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 781[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
782if test x$rxvt_cv_func_nl_langinfo = xyes; then 782if test x$rxvt_cv_func_nl_langinfo = xyes; then
783 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)
784fi 784fi
785 785
786AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds, 786SCM_RIGHTS_CHECK
787[AC_TRY_LINK([
788#include <cstddef> // broken bsds (is that redundant) need this
789#include <sys/types.h>
790#include <sys/socket.h>
791#include <sys/uio.h>
792],[
793{
794 msghdr msg;
795 iovec iov;
796 char buf [100];
797 char data = 0;
798
799 iov.iov_base = &data;
800 iov.iov_len = 1;
801
802 msg.msg_iov = &iov;
803 msg.msg_iovlen = 1;
804 msg.msg_control = buf;
805 msg.msg_controllen = sizeof buf;
806
807 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
808 cmsg->cmsg_level = SOL_SOCKET;
809 cmsg->cmsg_type = SCM_RIGHTS;
810 cmsg->cmsg_len = 100;
811
812 *(int *)CMSG_DATA (cmsg) = 5;
813
814 return sendmsg (3, &msg, 0);
815}
816],[rxvt_can_pass_fds=yes],[rxvt_can_pass_fds=no])])
817if test x$rxvt_can_pass_fds = xyes; then
818 AC_DEFINE(HAVE_UNIX_FDPASS, 1, Define if sys/socket.h defines the necessary macros/functions for file handle passing)
819else
820 AC_MSG_ERROR([urxvt requires unix-compliant filehandle passing ability])
821fi
822 787
823AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, 788AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
824[AC_COMPILE_IFELSE([ 789[AC_COMPILE_IFELSE([
825#include <X11/Xlib.h> 790#include <X11/Xlib.h>
826 791
… …
840 805
841dnl# -------------------------------------------------------------------------- 806dnl# --------------------------------------------------------------------------
842dnl# now add and remove other stuff 807dnl# now add and remove other stuff
843dnl# -------------------------------------------------------------------------- 808dnl# --------------------------------------------------------------------------
844if test x$support_xft = xyes; then 809if test x$support_xft = xyes; then
845 LIBS="$LIBS `pkg-config xft --libs`" 810 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
811 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
812 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
813 LIBS="$LIBS `$PKG_CONFIG xft --libs`"
846 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" 814 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
815 else
816 if test $XFT_CONFIG != no; then
817 LIBS="$LIBS `$XFT_CONFIG --libs`"
818 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
819 fi
820 fi
847 821
848 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 822 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
849 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 823 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
850 824
851 if test x$support_xft = xyes; then 825 if test x$support_xft = xyes; then

Diff Legend

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