comparison configure.in @ 392:1f50e6fe4f3f r21-2-11

Import from CVS: tag r21-2-11
author cvs
date Mon, 13 Aug 2007 11:10:50 +0200
parents aabb7f5b1c81
children 7d59cb494b73
comparison
equal deleted inserted replaced
391:e50d8e68d7a5 392:1f50e6fe4f3f
874 echo Making symbolic link to "$srcdir/$dir" 874 echo Making symbolic link to "$srcdir/$dir"
875 ${LN_S} "$srcdir/$dir" "$dir" 875 ${LN_S} "$srcdir/$dir" "$dir"
876 fi 876 fi
877 done 877 done
878 878
879 dnl Do our best to deal with automounter brokenness
880 dnl CANONICALIZE_PATH(varname)
881 define([CANONICALIZE_PATH],
882 [if test -d "/net"; then
883 if test -d "/tmp_mnt/net"; then tdir="tmp_mnt/net"; else tdir="tmp_mnt"; fi
884 $1=`echo "[$]$1" | \
885 sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"`
886 fi])dnl
887
879 dnl Calculate canonical name for blddir (i.e. current directory). 888 dnl Calculate canonical name for blddir (i.e. current directory).
880 dnl PWD may already be the preferable absolute name for ".", 889 dnl PWD may already be the preferable absolute name for ".",
881 dnl but we can't trust it - it is sometimes inaccurate. 890 dnl but we can't trust it - it is sometimes inaccurate.
882 absolute_pwd="`pwd`"; 891 absolute_pwd="`pwd`";
883 if test -n "$PWD" -a "`cd $PWD && pwd`" = "$absolute_pwd" 892 if test -n "$PWD" -a "`cd $PWD && pwd`" = "$absolute_pwd"
884 then blddir="$PWD" 893 then blddir="$PWD"
885 else blddir="$absolute_pwd" 894 else blddir="$absolute_pwd"; CANONICALIZE_PATH(blddir)
886 fi 895 fi
887 AC_SUBST(blddir) 896 AC_SUBST(blddir)
888 897
889 dnl Make srcdir absolute, if not already. It is important to 898 dnl Make srcdir absolute, if not already. It is important to
890 dnl avoid running the path through pwd unnecessary, since pwd can 899 dnl avoid running the path through pwd unnecessary, since pwd can
891 dnl give you automounter prefixes, which can go away. 900 dnl give you automounter prefixes, which can go away.
892 case "$srcdir" in 901 case "$srcdir" in
893 /* ) ;; 902 /* ) ;;
894 . ) srcdir="$blddir" ;; 903 . ) srcdir="$blddir" ;;
895 * ) srcdir="`cd $srcdir && pwd`" ;; 904 * ) srcdir="`cd $srcdir && pwd`"; CANONICALIZE_PATH(srcdir) ;;
896 esac 905 esac
897 906
898 dnl Check if the source directory already has a configured system in it. 907 dnl Check if the source directory already has a configured system in it.
899 if test `pwd` != `sh -c cd $srcdir && pwd` \ 908 if test `pwd` != `sh -c cd $srcdir && pwd` \
900 && test -f "$srcdir/src/config.h"; then 909 && test -f "$srcdir/src/config.h"; then
1454 *-esix* ) opsys=esix ;; 1463 *-esix* ) opsys=esix ;;
1455 *-mach* ) opsys=mach-bsd4-3 ;; 1464 *-mach* ) opsys=mach-bsd4-3 ;;
1456 *-xenix* ) opsys=xenix ;; 1465 *-xenix* ) opsys=xenix ;;
1457 *-sco3.2v4* ) opsys=sco4 NON_GNU_CPP=/lib/cpp ;; 1466 *-sco3.2v4* ) opsys=sco4 NON_GNU_CPP=/lib/cpp ;;
1458 *-bsd386* | *-bsdi1* ) opsys=bsd386 ;; 1467 *-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
1468 *-bsdi4* ) opsys=bsdos4 ;;
1459 *-bsdi3* ) opsys=bsdos3 ;; 1469 *-bsdi3* ) opsys=bsdos3 ;;
1460 *-bsdi2.1* ) opsys=bsdos2-1 ;; 1470 *-bsdi2.1* ) opsys=bsdos2-1 ;;
1461 *-bsdi2* ) opsys=bsdos2 ;; 1471 *-bsdi2* ) opsys=bsdos2 ;;
1462 *-sco3.2v5* ) opsys=sco5 ; 1472 *-sco3.2v5* ) opsys=sco5 ;
1463 dnl This is a pain. Like the current USL cc, SCO cc -E 1473 dnl This is a pain. Like the current USL cc, SCO cc -E
1939 dnl Try to autodetect runtime library flag (usually -R), 1949 dnl Try to autodetect runtime library flag (usually -R),
1940 dnl and whether it works (or at least does no harm) 1950 dnl and whether it works (or at least does no harm)
1941 AC_MSG_CHECKING("for runtime libraries flag") 1951 AC_MSG_CHECKING("for runtime libraries flag")
1942 case "$opsys" in 1952 case "$opsys" in
1943 sol2 ) dash_r="-R" ;; 1953 sol2 ) dash_r="-R" ;;
1944 decosf* | linux* ) dash_r="-rpath " ;; 1954 decosf* | linux* | irix*) dash_r="-rpath " ;;
1945 *) 1955 *)
1946 dash_r="" 1956 dash_r=""
1947 for try_dash_r in "-R" "-R " "-rpath "; do 1957 for try_dash_r in "-R" "-R " "-rpath "; do
1948 xe_check_libs="${try_dash_r}/no/such/file-or-directory" 1958 xe_check_libs="${try_dash_r}/no/such/file-or-directory"
1949 XE_PROTECT_LINKER_FLAGS(xe_check_libs) 1959 XE_PROTECT_LINKER_FLAGS(xe_check_libs)
2533 dnl It ought to be reasonable to have no output device at all, and only use 2543 dnl It ought to be reasonable to have no output device at all, and only use
2534 dnl XEmacs in --batch mode. 2544 dnl XEmacs in --batch mode.
2535 dnl if test "$with_tty" = "no" ; then 2545 dnl if test "$with_tty" = "no" ; then
2536 dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.]) 2546 dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
2537 dnl fi 2547 dnl fi
2538 for feature in tooltalk cde offix session xim xmu 2548 for feature in tooltalk cde offix session xim xmu
2539 do 2549 do
2540 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then 2550 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
2541 AC_MSG_WARN([--with-$feature ignored: Not valid without X support]) 2551 AC_MSG_WARN([--with-$feature ignored: Not valid without X support])
2542 fi 2552 fi
2543 eval "with_${feature}=no" 2553 eval "with_${feature}=no"
2983 dnl Do we have the XmIm* routines? And if so, do we want to use them? 2993 dnl Do we have the XmIm* routines? And if so, do we want to use them?
2984 dnl XIM seems to be flaky except on Solaris... 2994 dnl XIM seems to be flaky except on Solaris...
2985 dnl test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no 2995 dnl test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
2986 case "$with_xim" in "" | "yes" ) 2996 case "$with_xim" in "" | "yes" )
2987 AC_CHECKING(for XIM) 2997 AC_CHECKING(for XIM)
2998 AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no)
2988 dnl XIM + Lesstif is not (yet?) usable 2999 dnl XIM + Lesstif is not (yet?) usable
2989 if test "$have_lesstif" = "yes"; then with_xim=xlib 3000 if test "$have_motif $have_lesstif" = "yes no"; then
2990 else AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif, with_xim=xlib) 3001 AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif)
2991 fi 3002 fi ;;
2992 esac 3003 esac
2993 if test "$with_xim" != "no"; then 3004 if test "$with_xim" != "no"; then
2994 AC_DEFINE(HAVE_XIM) 3005 AC_DEFINE(HAVE_XIM)
2995 if test "$with_xim" = "xlib"; then 3006 if test "$with_xim" = "xlib"; then
2996 AC_DEFINE(XIM_XLIB) 3007 AC_DEFINE(XIM_XLIB)
3004 if test "$with_xim" = "motif"; then 3015 if test "$with_xim" = "motif"; then
3005 with_xfs=no 3016 with_xfs=no
3006 fi 3017 fi
3007 fi 3018 fi
3008 3019
3009 dnl "with_xim" = "yes" 3020 dnl "with_xfs" = "yes"
3010 if test "$with_xfs" = "yes" ; then 3021 if test "$with_xfs" = "yes" ; then
3011 AC_CHECKING(for XFontSet) 3022 AC_CHECKING(for XFontSet)
3012 AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no) 3023 AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no)
3013 if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then 3024 if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then
3014 AC_DEFINE(USE_XFONTSET) 3025 AC_DEFINE(USE_XFONTSET)
3015 if test "$with_xim" = "no" ; then 3026 if test "$with_xim" = "no" ; then
3016 XE_ADD_OBJS(input-method-xfs.o) 3027 XE_ADD_OBJS(input-method-xfs.o)
3017 fi 3028 fi
3018 fi 3029 fi
3019 fi dnl with_xim 3030 fi dnl with_xfs
3020 3031
3021 dnl Autodetect WNN 3032 dnl Autodetect WNN
3022 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support 3033 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
3023 test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) } 3034 test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) }
3024 dnl Detour to find crypt 3035 dnl Detour to find crypt
4088 motif ) echo " Using Motif scrollbars." ;; 4099 motif ) echo " Using Motif scrollbars." ;;
4089 athena ) echo " Using Athena scrollbars." ;; 4100 athena ) echo " Using Athena scrollbars." ;;
4090 athena3d ) echo " Using Athena-3d scrollbars." ;; 4101 athena3d ) echo " Using Athena-3d scrollbars." ;;
4091 esac 4102 esac
4092 case "$with_dialogs" in 4103 case "$with_dialogs" in
4093 motif ) echo " Using Motif dialog boxes." ;; 4104 motif )
4105 echo " Using Motif dialog boxes."
4106 if test "$unexec" = "unexaix.o" -a `uname -v` = 4 -a `uname -r` -ge 3; then
4107 echo " *WARNING* The Motif dialog boxes cause problems on AIX 4.3 and higher."
4108 echo " We recommend using the Athena dialog boxes instead."
4109 echo " Install libXaw and re-run configure with --with-dialogs='athena'."
4110 echo " Read the PROBLEMS file for more information."
4111 fi
4112 ;;
4094 athena ) echo " Using Athena dialog boxes." ;; 4113 athena ) echo " Using Athena dialog boxes." ;;
4095 athena3d ) echo " Using Athena-3d dialog boxes." ;; 4114 athena3d ) echo " Using Athena-3d dialog boxes." ;;
4096 esac 4115 esac
4097 test "$with_shlib" = "yes" && echo " Compiling in DLL support." 4116 test "$with_shlib" = "yes" && echo " Compiling in DLL support."
4098 test "$with_clash_detection" = yes && \ 4117 test "$with_clash_detection" = yes && \