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.56 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.59 by ayin, Tue Jun 26 20:53:07 2007 UTC

… …
529#include <sys/ioctl.h> 529#include <sys/ioctl.h>
530#ifdef HAVE_TERMIOS_H 530#ifdef HAVE_TERMIOS_H
531#include <termios.h> 531#include <termios.h>
532#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 532#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
533 533
534dnl# ELF systems may want to store paths for dynamic libraries.
535dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
536dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
537if test -n "$GCC"; then
538 LDARG="-Wl,"
539else
540 LDARG=""
541fi
542changequote(, )dnl
543R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
544changequote([, ])dnl
545
546ac_save_CFLAGS=$CFLAGS
547ac_save_LIBS=$LIBS
548CFLAGS="$CFLAGS $X_CFLAGS"
549LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
550AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
551[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
552#include <stdlib.h>
553main()
554{
555 exit(0);
556 (void) XOpenDisplay("foobar");
557}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
558 AC_MSG_WARN(You may need to check the LIBS line)])])
559if test x$rxvt_cv_rpath != xyes; then
560 changequote(, )dnl
561 R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
562 changequote([, ])dnl
563 LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
564 AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
565[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
566#include <stdlib.h>
567main()
568{
569 exit(0);
570 (void) XOpenDisplay("foobar");
571}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
572 if test x$rxvt_cv_R != xyes; then
573 LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574 fi
575fi
576
577AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 534AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
578[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 535[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
579if test x$rxvt_cv_xpointer = xyes; then 536if test x$rxvt_cv_xpointer = xyes; then
580 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 537 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581fi 538fi
… …
728dnl# this is a really hack test for some basic Xlocale stuff 685dnl# this is a really hack test for some basic Xlocale stuff
729ac_save_LIBS=$LIBS 686ac_save_LIBS=$LIBS
730ac_save_CFLAGS=$CFLAGS 687ac_save_CFLAGS=$CFLAGS
731CFLAGS="$CFLAGS $X_CFLAGS" 688CFLAGS="$CFLAGS $X_CFLAGS"
732LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 689LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
733if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
734 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
735fi
736AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 690AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> 691[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738#include <stdlib.h> 692#include <stdlib.h>
739main() { 693main() {
740char *p; 694char *p;
… …
838 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) 792 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839fi 793fi
840if test x$support_selectionscrolling = xyes; then 794if test x$support_selectionscrolling = xyes; then
841 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen) 795 AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
842fi 796fi
843if test x$support_frills = xyes; then
844 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
845fi
846if test x$support_mousewheel = xyes; then 797if test x$support_mousewheel = xyes; then
847 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) 798 AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848fi 799fi
849if test x$support_mouseslipwheel = xyes; then 800if test x$support_mouseslipwheel = xyes; then
850 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) 801 AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
… …
950 901
951if test x$support_perl = xyes; then 902if test x$support_perl = xyes; then
952 support_frills=yes 903 support_frills=yes
953fi 904fi
954 905
906if test x$support_frills = xyes; then
907 AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
908fi
909
955AC_SUBST(CFLAGS) 910AC_SUBST(CFLAGS)
956AC_SUBST(CPPFLAGS) 911AC_SUBST(CPPFLAGS)
957AC_SUBST(LDFLAGS) 912AC_SUBST(LDFLAGS)
958AC_SUBST(X_CFLAGS) 913AC_SUBST(X_CFLAGS)
959 914
960dnl# Attack the libs 915dnl# Attack the libs
961if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
962 LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
963 X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
964 X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
965 XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
966fi
967AC_SUBST(LIBS) 916AC_SUBST(LIBS)
968AC_SUBST(X_LIBS) 917AC_SUBST(X_LIBS)
969AC_SUBST(X_EXTRA_LIBS) 918AC_SUBST(X_EXTRA_LIBS)
970 919
971AC_SUBST(LIBAFTERIMAGE_CFLAGS) 920AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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