comparison configure.in @ 282:c42ec1d1cded r21-0b39

Import from CVS: tag r21-0b39
author cvs
date Mon, 13 Aug 2007 10:33:18 +0200
parents 7df0dd720c89
children 558f606b08ae
comparison
equal deleted inserted replaced
281:090b52736db2 282:c42ec1d1cded
449 with_gnu_make | \ 449 with_gnu_make | \
450 dynamic | \ 450 dynamic | \
451 with_ncurses | \ 451 with_ncurses | \
452 with_dnet | \ 452 with_dnet | \
453 with_socks | \ 453 with_socks | \
454 with_dragndrop | \
454 with_cde | \ 455 with_cde | \
455 with_offix | \ 456 with_offix | \
456 with_gpm | \ 457 with_gpm | \
457 with_xpm | \ 458 with_xpm | \
458 with_xface | \ 459 with_xface | \
2415 2416
2416 test -z "$window_system" && window_system="none" 2417 test -z "$window_system" && window_system="none"
2417 2418
2418 dnl Test for features that require a window system - ANY window system 2419 dnl Test for features that require a window system - ANY window system
2419 if test "$window_system" = "none"; then 2420 if test "$window_system" = "none"; then
2420 for feature in menubars scrollbars toolbars dialogs 2421 for feature in menubars scrollbars toolbars dialogs dragndrop
2421 do 2422 do
2422 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then 2423 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
2423 AC_MSG_WARN([--with-$feature ignored: Not valid without window system support]) 2424 AC_MSG_WARN([--with-$feature ignored: Not valid without window system support])
2424 fi 2425 fi
2425 eval "with_${feature}=no" 2426 eval "with_${feature}=no"
2490 AC_DEFINE(HAVE_XAUTH) 2491 AC_DEFINE(HAVE_XAUTH)
2491 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS) 2492 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
2492 fi 2493 fi
2493 AC_SUBST(libs_xauth) 2494 AC_SUBST(libs_xauth)
2494 2495
2495 dnl Always compile OffiX unless --without-offix is given or no 2496 dnl Always compile OffiX unless --without-offix is given, no
2496 dnl X11 support is compiled in or no standard Xmu. 2497 dnl X11 support is compiled in, no standard Xmu is avaiable,
2498 dnl or dragndrop support is disabled
2497 test "$window_system" != "x11" && with_offix=no 2499 test "$window_system" != "x11" && with_offix=no
2498 if test "$with_xmu" != yes -a "$with_x11" = yes; then 2500 if test "$with_xmu" != yes -a "$with_x11" = yes; then
2499 AC_MSG_WARN([No OffiX without real Xmu support]) 2501 AC_MSG_WARN([No OffiX without real Xmu support])
2500 with_offix=no 2502 with_offix=no
2501 fi 2503 fi
2504 if test "$with_dragndrop" = no; then
2505 AC_MSG_WARN([No OffiX without generic Drag'n'Drop support])
2506 with_offix=no
2507 fi
2502 test -z "$with_offix" && with_offix=yes 2508 test -z "$with_offix" && with_offix=yes
2503 if test "$with_offix" = "yes"; then 2509 if test "$with_offix" = "yes"; then
2504 AC_DEFINE(HAVE_OFFIX_DND) 2510 AC_DEFINE(HAVE_OFFIX_DND)
2505 XE_APPEND(offix.o, dnd_objs) 2511 XE_APPEND(offix.o, dnd_objs)
2506 fi 2512 XE_APPEND(OffiX, dragndrop_proto)
2507 2513 fi
2514
2515 dnl This one is for the static initializeds variables in
2516 dnl offix.c, so that the thing is dumped after lastfile.o
2508 AC_SUBST(dnd_objs) 2517 AC_SUBST(dnd_objs)
2509 2518
2510 dnl Autodetect tooltalk 2519 dnl Autodetect tooltalk
2511 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk 2520 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk
2512 if test "$with_tooltalk" != "no" ; then 2521 if test "$with_tooltalk" != "no" ; then
2533 2542
2534 dnl Autodetect CDE 2543 dnl Autodetect CDE
2535 test -z "$with_cde" && { AC_CHECK_HEADER(Dt/Dt.h, , with_cde=no) } 2544 test -z "$with_cde" && { AC_CHECK_HEADER(Dt/Dt.h, , with_cde=no) }
2536 test -z "$with_cde" && { AC_CHECK_LIB(DtSvc, DtDndDragStart, [:], with_cde=no) } 2545 test -z "$with_cde" && { AC_CHECK_LIB(DtSvc, DtDndDragStart, [:], with_cde=no) }
2537 test -z "$with_cde" && with_cde=yes 2546 test -z "$with_cde" && with_cde=yes
2547 if test "$with_dragndrop" = no; then
2548 AC_MSG_WARN([No CDE without generic Drag'n'Drop support])
2549 with_cde=no
2550 fi
2538 if test "$with_cde" = "yes" ; then 2551 if test "$with_cde" = "yes" ; then
2539 AC_DEFINE(HAVE_CDE) 2552 AC_DEFINE(HAVE_CDE)
2540 XE_PREPEND(-lDtSvc, libs_x) 2553 XE_PREPEND(-lDtSvc, libs_x)
2554 XE_APPEND(CDE, dragndrop_proto)
2541 with_tooltalk=yes # CDE requires Tooltalk 2555 with_tooltalk=yes # CDE requires Tooltalk
2542 need_motif=yes # CDE requires Motif 2556 need_motif=yes # CDE requires Motif
2557 fi
2558
2559 dnl Autodetect Drag'n'Drop support
2560 dnl always included if CDE, Offix, or MSWindows are defined
2561 AC_MSG_CHECKING(if drag and drop API is needed)
2562 if test "$with_dragndrop" != "no" ; then
2563 if test -n "$dragndrop_proto" ; then
2564 with_dragndrop=yes
2565 AC_MSG_RESULT([yes (${dragndrop_proto} )])
2566 AC_DEFINE(HAVE_DRAGNDROP)
2567 XE_APPEND(dragdrop.o, extra_objs)
2568 else
2569 with_dragndrop=no
2570 AC_MSG_RESULT(no)
2571 fi
2543 fi 2572 fi
2544 2573
2545 dnl Autodetect LDAP 2574 dnl Autodetect LDAP
2546 AC_CHECKING(for LDAP) 2575 AC_CHECKING(for LDAP)
2547 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } 2576 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
3849 test "$with_i18n3" = yes && echo " Compiling in I18N support, level 3 (doesn't currently work)." 3878 test "$with_i18n3" = yes && echo " Compiling in I18N support, level 3 (doesn't currently work)."
3850 3879
3851 test "$with_cde" = yes && echo " Compiling in support for CDE." 3880 test "$with_cde" = yes && echo " Compiling in support for CDE."
3852 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." 3881 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
3853 test "$with_offix" = yes && echo " Compiling in support for OffiX." 3882 test "$with_offix" = yes && echo " Compiling in support for OffiX."
3883 test "$with_dragndrop" = yes && echo " Compiling in support for Drag'n'Drop ($dragndrop_proto )."
3854 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." 3884 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
3855 test "$with_session" != no && echo " Compiling in support for proper session-management." 3885 test "$with_session" != no && echo " Compiling in support for proper session-management."
3856 case "$with_menubars" in 3886 case "$with_menubars" in
3857 lucid ) echo " Using Lucid menubars." ;; 3887 lucid ) echo " Using Lucid menubars." ;;
3858 motif ) echo " Using Motif menubars." 3888 motif ) echo " Using Motif menubars."