comparison configure.in @ 288:e11d67e05968 r21-0b42

Import from CVS: tag r21-0b42
author cvs
date Mon, 13 Aug 2007 10:35:54 +0200
parents 57709be46d1b
children c9fe270a4101
comparison
equal deleted inserted replaced
287:13a0bd77a29d 288:e11d67e05968
1733 dnl Should we take debugging options into consideration? 1733 dnl Should we take debugging options into consideration?
1734 if test "$GCC" = "yes"; then 1734 if test "$GCC" = "yes"; then
1735 CFLAGS="-g -O3 -Wall -Wno-switch" 1735 CFLAGS="-g -O3 -Wall -Wno-switch"
1736 dnl I'm not convinced this is a good idea any more. -sb 1736 dnl I'm not convinced this is a good idea any more. -sb
1737 dnl test "$opsys $machine" = "linux intel386" && \ 1737 dnl test "$opsys $machine" = "linux intel386" && \
1738 dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2" 1738 dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
1739 dnl cygwin can't cope with -O3
1740 test "$opsys $machine" = "cygwin32 intel386" && \
1741 CFLAGS="-g -O2 -Wall -Wno-switch"
1739 elif test "$__sunpro_c" = "yes"; then 1742 elif test "$__sunpro_c" = "yes"; then
1740 case "$opsys" in 1743 case "$opsys" in
1741 sol2 ) CFLAGS="-v -xO4" ;; 1744 sol2 ) CFLAGS="-v -xO4" ;;
1742 sunos4* ) CFLAGS="-xO2";; 1745 sunos4* ) CFLAGS="-xO2";;
1743 esac 1746 esac
2418 && XE_ADD_OBJS(scrollbar-msw.o) 2421 && XE_ADD_OBJS(scrollbar-msw.o)
2419 test "$with_menubars" != "no" && with_menubars=msw \ 2422 test "$with_menubars" != "no" && with_menubars=msw \
2420 && XE_ADD_OBJS(menubar-msw.o) 2423 && XE_ADD_OBJS(menubar-msw.o)
2421 test "$with_toolbars" != "no" && with_toolbars=msw \ 2424 test "$with_toolbars" != "no" && with_toolbars=msw \
2422 && XE_ADD_OBJS(toolbar-msw.o) 2425 && XE_ADD_OBJS(toolbar-msw.o)
2423 with_dialogs=msw 2426 test "$with_dialogs" != "no" && with_dialogs=msw \
2427 && XE_ADD_OBJS(dialog-msw.o)
2424 else 2428 else
2425 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o) 2429 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
2426 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o) 2430 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o)
2427 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o) 2431 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o)
2432 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-msw.o)
2428 fi 2433 fi
2429 dnl check for our special version of select 2434 dnl check for our special version of select
2430 AC_TRY_RUN([#include <fcntl.h> 2435 AC_TRY_RUN([#include <fcntl.h>
2431 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }], 2436 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }],
2432 [AC_DEFINE(HAVE_MSG_SELECT)]) 2437 [AC_DEFINE(HAVE_MSG_SELECT)])
2517 AC_DEFINE(HAVE_XAUTH) 2522 AC_DEFINE(HAVE_XAUTH)
2518 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS) 2523 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
2519 fi 2524 fi
2520 AC_SUBST(libs_xauth) 2525 AC_SUBST(libs_xauth)
2521 2526
2522 dnl Always compile OffiX unless --without-offix is given, no
2523 dnl X11 support is compiled in, no standard Xmu is avaiable,
2524 dnl or dragndrop support is disabled
2525 test "$window_system" != "x11" && with_offix=no
2526 if test "$with_xmu" != yes -a "$with_x11" = yes; then
2527 AC_MSG_WARN([No OffiX without real Xmu support])
2528 with_offix=no
2529 fi
2530 if test "$with_dragndrop" = no; then
2531 AC_MSG_WARN([No OffiX without generic Drag'n'Drop support])
2532 with_offix=no
2533 fi
2534 test -z "$with_offix" && with_offix=yes
2535 if test "$with_offix" = "yes"; then
2536 AC_DEFINE(HAVE_OFFIX_DND)
2537 XE_APPEND(offix.o, dnd_objs)
2538 XE_APPEND(OffiX, dragndrop_proto)
2539 fi
2540
2541 dnl This one is for the static initializeds variables in 2527 dnl This one is for the static initializeds variables in
2542 dnl offix.c, so that the thing is dumped after lastfile.o 2528 dnl offix.c, so that the thing is dumped after lastfile.o
2543 AC_SUBST(dnd_objs) 2529 AC_SUBST(dnd_objs)
2544 2530
2545 dnl Autodetect tooltalk 2531 dnl Autodetect tooltalk
2588 AC_DEFINE(HAVE_CDE) 2574 AC_DEFINE(HAVE_CDE)
2589 XE_PREPEND(-lDtSvc, libs_x) 2575 XE_PREPEND(-lDtSvc, libs_x)
2590 XE_APPEND(CDE, dragndrop_proto) 2576 XE_APPEND(CDE, dragndrop_proto)
2591 with_tooltalk=yes # CDE requires Tooltalk 2577 with_tooltalk=yes # CDE requires Tooltalk
2592 need_motif=yes # CDE requires Motif 2578 need_motif=yes # CDE requires Motif
2579 fi
2580
2581 dnl Always compile OffiX unless --without-offix is given, no
2582 dnl X11 support is compiled in, no standard Xmu is avaiable,
2583 dnl or dragndrop support is disabled
2584 test "$window_system" != "x11" && with_offix=no
2585 if test "$with_xmu" != yes -a "$with_x11" = yes; then
2586 AC_MSG_WARN([No OffiX without real Xmu support])
2587 with_offix=no
2588 fi
2589 if test "$with_dragndrop" = no; then
2590 AC_MSG_WARN([No OffiX without generic Drag'n'Drop support])
2591 with_offix=no
2592 fi
2593 if test "$with_cde" = yes; then
2594 AC_MSG_WARN([CDE already found, disabling OffiX support])
2595 with_offix=no
2596 fi
2597 test -z "$with_offix" && with_offix=yes
2598 if test "$with_offix" = "yes"; then
2599 AC_DEFINE(HAVE_OFFIX_DND)
2600 XE_APPEND(offix.o, dnd_objs)
2601 XE_APPEND(OffiX, dragndrop_proto)
2593 fi 2602 fi
2594 2603
2595 dnl Autodetect Drag'n'Drop support 2604 dnl Autodetect Drag'n'Drop support
2596 dnl always included if CDE, Offix, or MSWindows are defined 2605 dnl always included if CDE, Offix, or MSWindows are defined
2597 AC_MSG_CHECKING(if drag and drop API is needed) 2606 AC_MSG_CHECKING(if drag and drop API is needed)
2691 AC_CHECK_LIB(z, inflate, [XE_PREPEND(-lz, libs_x)],[ 2700 AC_CHECK_LIB(z, inflate, [XE_PREPEND(-lz, libs_x)],[
2692 AC_CHECK_LIB(gz, inflate, [XE_PREPEND(-lgz, libs_x)])])]) 2701 AC_CHECK_LIB(gz, inflate, [XE_PREPEND(-lgz, libs_x)])])])
2693 fi 2702 fi
2694 2703
2695 dnl Autodetect GIFlib 2704 dnl Autodetect GIFlib
2696 AC_MSG_CHECKING(for giflib - no older than 3.1) 2705 AC_MSG_CHECKING(for gifreader)
2697 test -z "$with_gif" && { AC_CHECK_HEADER(gif_lib.h, ,with_gif=no) } 2706 test -z "$with_gif" && { AC_CHECK_HEADER(gifrlib.h, ,with_gif=no) }
2698 test -z "$with_gif" && { AC_CHECK_LIB(gif, GetGifError,[:] ,with_gif=no) } 2707 test -z "$with_gif" && { AC_CHECK_LIB(gifreader, GetGifError,[:] ,with_gif=no) }
2699 test -z "$with_gif" && with_gif=yes 2708 test -z "$with_gif" && with_gif=yes
2700 if test "$with_gif" = "yes"; then 2709 if test "$with_gif" = "yes"; then
2701 AC_DEFINE(HAVE_GIF) 2710 AC_DEFINE(HAVE_GIF)
2702 XE_PREPEND(-lgif, libs_x) 2711 XE_PREPEND(-lgifreader, libs_x)
2703 fi 2712 fi
2704 2713
2705 dnl autodetect JPEG 2714 dnl autodetect JPEG
2706 test -z "$with_jpeg" && { AC_CHECK_HEADER(jpeglib.h, ,with_jpeg=no) } 2715 test -z "$with_jpeg" && { AC_CHECK_HEADER(jpeglib.h, ,with_jpeg=no) }
2707 test -z "$with_jpeg" && { AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[:],with_jpeg=no) } 2716 test -z "$with_jpeg" && { AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[:],with_jpeg=no) }