… | |
… | |
45 | save_LIBS="$LIBS" |
45 | save_LIBS="$LIBS" |
46 | CXX="$CC" |
46 | CXX="$CC" |
47 | LIBS="$LIBS -lsupc++" |
47 | LIBS="$LIBS -lsupc++" |
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, making everything bigger and slower]) |
53 | AC_MSG_RESULT([no, making everything bigger and slower]) |
54 | LIBS="$save_LIBS" |
54 | LIBS="$save_LIBS" |
55 | LINKER="$save_CXX" |
55 | LINKER="$save_CXX" |
… | |
… | |
57 | ) |
57 | ) |
58 | CXX="$save_CXX" |
58 | CXX="$save_CXX" |
59 | fi |
59 | fi |
60 | AC_SUBST(LINKER,[$LINKER]) |
60 | AC_SUBST(LINKER,[$LINKER]) |
61 | |
61 | |
62 | AC_LANG(C++) |
|
|
63 | dnl# -------------------------------------------------------------------------- |
62 | dnl# -------------------------------------------------------------------------- |
64 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
63 | dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' |
65 | dnl# |
64 | dnl# |
66 | if test -z "$orig_CXXFLAGS"; then |
65 | if test -z "$orig_CXXFLAGS"; then |
67 | if test x$GCC = xyes && test "x$GXX" = xyes; then |
66 | if test x$GCC = xyes && test "x$GXX" = xyes; then |
68 | CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" |
67 | CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" |
69 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"]) |
68 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) |
70 | else |
69 | else |
71 | CXXFLAGS="-O" |
70 | CXXFLAGS="-O" |
72 | fi |
71 | fi |
73 | CFLAGS="$CXXFLAGS" |
72 | CFLAGS="$CXXFLAGS" |
74 | fi |
73 | fi |
… | |
… | |
274 | [ --enable-plain-scroll enable plain style scrollbar], |
273 | [ --enable-plain-scroll enable plain style scrollbar], |
275 | [if test x$enableval = xyes -o x$enableval = xno; then |
274 | [if test x$enableval = xyes -o x$enableval = xno; then |
276 | support_scroll_plain=$enableval |
275 | support_scroll_plain=$enableval |
277 | fi]) |
276 | fi]) |
278 | |
277 | |
279 | dnl AC_ARG_ENABLE(half-shadow, |
|
|
280 | dnl [ --enable-half-shadow use half width/height shadow on rxvt scrollbar], |
|
|
281 | dnl [if test x$enableval = xyes; then |
|
|
282 | dnl AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) |
|
|
283 | dnl fi]) |
|
|
284 | |
|
|
285 | AC_ARG_WITH(codesets, |
278 | AC_ARG_WITH(codesets, |
286 | [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], |
279 | [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], |
287 | [codesets="$withval"]) |
280 | [codesets="$withval"]) |
288 | |
281 | |
289 | AC_ARG_ENABLE(xim, |
282 | AC_ARG_ENABLE(xim, |
… | |
… | |
506 | ac_save_CFLAGS=$CFLAGS |
499 | ac_save_CFLAGS=$CFLAGS |
507 | ac_save_LIBS=$LIBS |
500 | ac_save_LIBS=$LIBS |
508 | CFLAGS="$CFLAGS $X_CFLAGS" |
501 | CFLAGS="$CFLAGS $X_CFLAGS" |
509 | LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
502 | LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
510 | AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, |
503 | AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, |
511 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
504 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
505 | #include <stdlib.h> |
512 | main() |
506 | main() |
513 | { |
507 | { |
514 | exit(0); |
508 | exit(0); |
515 | (void) XOpenDisplay("foobar"); |
509 | (void) XOpenDisplay("foobar"); |
516 | }]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl |
510 | }]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl |
… | |
… | |
519 | changequote(, )dnl |
513 | changequote(, )dnl |
520 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' |
514 | R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' |
521 | changequote([, ])dnl |
515 | changequote([, ])dnl |
522 | LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
516 | LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` |
523 | AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, |
517 | AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, |
524 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
518 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
519 | #include <stdlib.h> |
525 | main() |
520 | main() |
526 | { |
521 | { |
527 | exit(0); |
522 | exit(0); |
528 | (void) XOpenDisplay("foobar"); |
523 | (void) XOpenDisplay("foobar"); |
529 | }]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) |
524 | }]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) |
… | |
… | |
538 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
533 | AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) |
539 | fi |
534 | fi |
540 | LIBS=$ac_save_LIBS |
535 | LIBS=$ac_save_LIBS |
541 | CFLAGS=$ac_save_CFLAGS |
536 | CFLAGS=$ac_save_CFLAGS |
542 | |
537 | |
|
|
538 | AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, |
|
|
539 | [AC_COMPILE_IFELSE( |
|
|
540 | [AC_LANG_PROGRAM([ |
|
|
541 | #define XLIB_ILLEGAL_ACCESS |
|
|
542 | #include <X11/Xlib.h> |
|
|
543 | ],[ |
|
|
544 | Display *dpy; |
|
|
545 | dpy->xdefaults = (char *)0; |
|
|
546 | ])], |
|
|
547 | [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] |
|
|
548 | )]) |
|
|
549 | if test x$rxvt_xlib_illegal_access = xyes; then |
|
|
550 | AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) |
|
|
551 | fi |
543 | |
552 | |
544 | AC_C_CONST |
553 | AC_C_CONST |
545 | AC_C_INLINE |
554 | AC_C_INLINE |
546 | |
555 | |
547 | dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. |
556 | dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. |
… | |
… | |
677 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
686 | if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then |
678 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
687 | LIBS=`echo $LIBS | sed "$R_TRANSLATE"` |
679 | fi |
688 | fi |
680 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
689 | AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, |
681 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
690 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h> |
|
|
691 | #include <stdlib.h> |
682 | main() { |
692 | main() { |
683 | char *p; |
693 | char *p; |
684 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
694 | if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) |
685 | exit (XSupportsLocale() ? 0 : 1); |
695 | exit (XSupportsLocale() ? 0 : 1); |
686 | else |
696 | else |
… | |
… | |
883 | AC_SUBST(PERLPRIVLIBEXP) |
893 | AC_SUBST(PERLPRIVLIBEXP) |
884 | AC_SUBST(PERL) |
894 | AC_SUBST(PERL) |
885 | AC_SUBST(IF_PERL) |
895 | AC_SUBST(IF_PERL) |
886 | AC_SUBST(PERL_O) |
896 | AC_SUBST(PERL_O) |
887 | |
897 | |
|
|
898 | AC_TRY_LINK([ |
|
|
899 | #include <EXTERN.h> |
|
|
900 | #include <perl.h> |
|
|
901 | #include <XSUB.h> |
|
|
902 | ],[ |
|
|
903 | PerlInterpreter *perl = perl_alloc (); |
|
|
904 | ],[rxvt_perl_link=yes],[rxvt_perl_link=no]) |
888 | if test x$support_perl = xyes; then |
905 | if test x$support_perl = xyes; then |
889 | support_frills=yes |
906 | support_frills=yes |
890 | fi |
907 | fi |
891 | |
908 | |
892 | dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) |
|
|
893 | |
|
|
894 | CFLAGS=${CFLAGS--O} |
|
|
895 | LDFLAGS=${LDFLAGS--O} |
|
|
896 | |
|
|
897 | CPPFLAGS="$CPPFLAGS" |
|
|
898 | AC_SUBST(DEBUG) |
909 | AC_SUBST(DEBUG) |
899 | AC_SUBST(DINCLUDE) |
910 | AC_SUBST(DINCLUDE) |
900 | AC_SUBST(CFLAGS) |
911 | AC_SUBST(CFLAGS) |
901 | AC_SUBST(CPPFLAGS) |
912 | AC_SUBST(CPPFLAGS) |
902 | AC_SUBST(LDFLAGS) |
913 | AC_SUBST(LDFLAGS) |
… | |
… | |
953 | |
964 | |
954 | Rxvt version: $VERSION : $DATE |
965 | Rxvt version: $VERSION : $DATE |
955 | Source code location: $srcdir |
966 | Source code location: $srcdir |
956 | Install path: ${prefix}/bin |
967 | Install path: ${prefix}/bin |
957 | Compiler: $CXX |
968 | Compiler: $CXX |
958 | Compiler flags: $CFLAGS |
969 | Compiler flags: $CXXFLAGS |
959 | Linker: $LINKER" |
970 | Linker: $LINKER" |
960 | |
971 | |
961 | if test x$support_xpm = xyes; then |
972 | if test x$support_xpm = xyes; then |
962 | echo " Xpm library: $XPM_LIBS" |
973 | echo " Xpm library: $XPM_LIBS" |
963 | fi |
974 | fi |
… | |
… | |
995 | fi |
1006 | fi |
996 | |
1007 | |
997 | echo "*** Optionally check src/feature.h for further, rarely used options ***" |
1008 | echo "*** Optionally check src/feature.h for further, rarely used options ***" |
998 | echo |
1009 | echo |
999 | |
1010 | |
1000 | echo ".----------------------------------------------------------------." |
|
|
1001 | echo ". NOTE: some features are disabled by default, try ." |
|
|
1002 | echo ". configure --help to get an idea of the optional features, ." |
|
|
1003 | echo ". or read ./README.configure ." |
|
|
1004 | echo ". ." |
|
|
1005 | echo ". The script ./reconf gives a reasonable baseline, try it if ." |
|
|
1006 | echo ". you do not want to read documentation and still want some ." |
|
|
1007 | echo ". useful features. ." |
|
|
1008 | echo ".----------------------------------------------------------------." |
|
|
1009 | echo |
|
|
1010 | |
|
|