Mercurial > hg > xemacs-beta

comparison configure.in @ 159:3bb7ccffb0c0 r20-3b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b6
author cvs
date Mon, 13 Aug 2007 09:41:43 +0200
parents 6b37e6ddd302
children 0132846995bd
comparison
equal deleted inserted replaced
158:558dfa75ffb3 159:3bb7ccffb0c0
601 -no-create | --no-create | --no-creat | --no-crea | --no-cre \ 601 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
602 | --no-cr | --no-c) ;; 602 | --no-cr | --no-c) ;;
603 -no-recursion | --no-recursion | --no-recursio | --no-recursi \ 603 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
604 | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; 604 | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
605 *) 605 *)
606 quoted_i="`echo $i | sed $quoted_sed_magic`" 606 quoted_i="`echo '' $i | sed -e 's:^ ::' -e $quoted_sed_magic`"
607 quoted_arguments="$quoted_arguments '$quoted_i'" ;; 607 quoted_arguments="$quoted_arguments '$quoted_i'" ;;
608 esac 608 esac
609 done 609 done
610 610
611 dnl Do not use shift -- that destroys the argument list, which autoconf needs 611 dnl Do not use shift -- that destroys the argument list, which autoconf needs
747 dnl Has the user requested database support? 747 dnl Has the user requested database support?
748 "with_database" ) 748 "with_database" )
749 with_database_berkdb=no 749 with_database_berkdb=no
750 with_database_dbm=no 750 with_database_dbm=no
751 with_database_gnudbm=no 751 with_database_gnudbm=no
752 for x in `echo "$val" | sed 's/,/ /'` ; do 752 for x in `echo "$val" | sed -e 's/,/ /'` ; do
753 case "$x" in 753 case "$x" in
754 no ) ;; 754 no ) ;;
755 b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;; 755 b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;;
756 d | db | dbm ) with_database_dbm=yes ;; 756 d | db | dbm ) with_database_dbm=yes ;;
757 g | gn | gnu | gnud | gnudb | gnudbm ) with_database_gnudbm=yes ;; 757 g | gn | gnu | gnud | gnudb | gnudbm ) with_database_gnudbm=yes ;;
812 "error_checking" ) 812 "error_checking" )
813 dnl value can be all, none, and/or a list of categories to check. 813 dnl value can be all, none, and/or a list of categories to check.
814 dnl Example: --error-checking=all,noextents,nobufpos 814 dnl Example: --error-checking=all,noextents,nobufpos
815 dnl Example: --error-checking=none,malloc,gc 815 dnl Example: --error-checking=none,malloc,gc
816 816
817 for x in `echo "$val" | sed 's/,/ /'` ; do 817 for x in `echo "$val" | sed -e 's/,/ /'` ; do
818 case "$x" in 818 case "$x" in
819 dnl all and none are only permitted as the first in the list. 819 dnl all and none are only permitted as the first in the list.
820 n | no | non | none ) new_default=no ;; 820 n | no | non | none ) new_default=no ;;
821 a | al | all ) new_default=yes ;; 821 a | al | all ) new_default=yes ;;
822 822
940 dnl --extra-verbose implies --verbose 940 dnl --extra-verbose implies --verbose
941 test "$extra_verbose" = "yes" && verbose=yes 941 test "$extra_verbose" = "yes" && verbose=yes
942 942
943 dnl Allow use of either ":" or spaces for lists of directories 943 dnl Allow use of either ":" or spaces for lists of directories
944 define(COLON_TO_SPACE, 944 define(COLON_TO_SPACE,
945 [case "[$1]" in *:* [)] [$1]="`echo $[$1] | sed 's/:/ /g'`";; esac])dnl 945 [case "[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's:^ ::' -e 's/:/ /g'`";; esac])dnl
946 COLON_TO_SPACE(site_includes) 946 COLON_TO_SPACE(site_includes)
947 COLON_TO_SPACE(site_libraries) 947 COLON_TO_SPACE(site_libraries)
948 COLON_TO_SPACE(site_runtime_libraries) 948 COLON_TO_SPACE(site_runtime_libraries)
949 949
950 dnl with_x is obsolete synonym for with_x11 950 dnl with_x is obsolete synonym for with_x11
1828 1828
1829 dnl XE_COMPUTE_RUNPATH() 1829 dnl XE_COMPUTE_RUNPATH()
1830 define([XE_COMPUTE_RUNPATH],[ 1830 define([XE_COMPUTE_RUNPATH],[
1831 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then 1831 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
1832 dnl Remove runtime paths from current ld switches 1832 dnl Remove runtime paths from current ld switches
1833 ld_switch_site="`echo $ld_switch_site | sed \"s/${dash_r}[[^ ]]*//\"`" 1833 ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/${dash_r}[[^ ]]*//"`
1834 ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[[^ ]]*//\"`" 1834 ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[[^ ]]*//"`
1835 dnl PRINT_VAR(ld_switch_site, ld_switch_x_site) 1835 dnl PRINT_VAR(ld_switch_site, ld_switch_x_site)
1836 1836
1837 dnl Fix up Runtime path 1837 dnl Fix up Runtime path
1838 dnl If LD_RUN_PATH is set in environment, use that. 1838 dnl If LD_RUN_PATH is set in environment, use that.
1839 dnl In this case, assume user has set the right value. 1839 dnl In this case, assume user has set the right value.
1844 dnl Compute runpath from gcc's -v output 1844 dnl Compute runpath from gcc's -v output
1845 echo "int main(int argc, char *argv[[]]) {return 0;}" > conftest.c 1845 echo "int main(int argc, char *argv[[]]) {return 0;}" > conftest.c
1846 xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null' 1846 xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
1847 for arg in `eval "$xe_runpath_link" | grep ' -L'`; do 1847 for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
1848 case "$arg" in P,* | -L* | -R* ) 1848 case "$arg" in P,* | -L* | -R* )
1849 for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do 1849 for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
1850 XE_ADD_RUNPATH_DIR("$dir") 1850 XE_ADD_RUNPATH_DIR("$dir")
1851 done ;; 1851 done ;;
1852 esac 1852 esac
1853 done 1853 done
1854 rm -f conftest* 1854 rm -f conftest*
1855 else 1855 else
1856 dnl Add all directories with .so files to runpath 1856 dnl Add all directories with .so files to runpath
1857 for arg in $ld_switch_site $ld_switch_x_site; do 1857 for arg in $ld_switch_site $ld_switch_x_site; do
1858 case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo "$arg" | sed 's/^-L//'`);; esac 1858 case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`);; esac
1859 done 1859 done
1860 dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available 1860 dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available
1861 case "$canonical" in *-solaris2.[[1-4]]* ) 1861 case "$canonical" in *-solaris2.[[1-4]]* )
1862 test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;; 1862 test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
1863 esac 1863 esac
1959 1959
1960 dnl define SIZEOF_TYPE 1960 dnl define SIZEOF_TYPE
1961 AC_CHECK_SIZEOF(short) 1961 AC_CHECK_SIZEOF(short)
1962 AC_CHECK_SIZEOF(int) 1962 AC_CHECK_SIZEOF(int)
1963 AC_CHECK_SIZEOF(long) 1963 AC_CHECK_SIZEOF(long)
1964 if test "$ac_cv_sizeof_long" = 0; then
1965 echo ""
1966 echo "*** PANIC *** Configure tests are not working - compiler is broken."
1967 echo "*** PANIC *** Please examine config.log for compilation errors."
1968 exit 1
1969 fi
1964 1970
1965 dnl check for long file names 1971 dnl check for long file names
1966 AC_SYS_LONG_FILE_NAMES 1972 AC_SYS_LONG_FILE_NAMES
1967 1973
1968 dnl other checks for UNIX variants 1974 dnl -lm is required by LISP_FLOAT_TYPE, among other things
1969
1970 dnl -lm might be required for some X libraries to link with later
1971 AC_CHECK_LIB(m, sqrt) 1975 AC_CHECK_LIB(m, sqrt)
1976
1977 dnl -lPW might be needed on some systems
1978 AC_CHECK_LIB(PW, main)
1972 1979
1973 dnl Floating operation support is now unconditional 1980 dnl Floating operation support is now unconditional
1974 AC_DEFINE(LISP_FLOAT_TYPE) 1981 AC_DEFINE(LISP_FLOAT_TYPE)
1975 1982
1976 dnl Determine type of mail locking from configure args and s&m headers 1983 dnl Determine type of mail locking from configure args and s&m headers
2068 XE_APPEND(lwlib, MAKE_SUBDIR) 2075 XE_APPEND(lwlib, MAKE_SUBDIR)
2069 2076
2070 dnl Try to find Motif/CDE/Tooltalk dirs 2077 dnl Try to find Motif/CDE/Tooltalk dirs
2071 dnl These take precedence over other X libs/includes, so PRE-pend 2078 dnl These take precedence over other X libs/includes, so PRE-pend
2072 for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do 2079 for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
2073 inc_dir="`echo $lib_dir | sed 's/lib/include/'`" 2080 inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
2074 if test -d "$lib_dir" -a -d "$inc_dir"; then 2081 if test -d "$lib_dir" -a -d "$inc_dir"; then
2075 case "$x_libraries" in *"$lib_dir"* ) ;; *) 2082 case "$x_libraries" in *"$lib_dir"* ) ;; *)
2076 x_libraries="$lib_dir $x_libraries" 2083 x_libraries="$lib_dir $x_libraries"
2077 XE_PREPEND(-L${lib_dir}, X_LIBS) ;; 2084 XE_PREPEND(-L${lib_dir}, X_LIBS) ;;
2078 esac 2085 esac
2175 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x)) 2182 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x))
2176 2183
2177 dnl Autodetect -lXaw 2184 dnl Autodetect -lXaw
2178 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no) 2185 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no)
2179 2186
2187 dnl Autodetect -DNARROWPROTO
2188 AC_MSG_CHECKING(for NARROWPROTO)
2189 rm -fr conftestdir
2190 if mkdir conftestdir; then
2191 cd conftestdir
2192 cat > Imakefile <<'EOF'
2193 xetest:
2194 @echo 'proto_defines="${PROTO_DEFINES}"'
2195 EOF
2196 if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
2197 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
2198 eval `${MAKE-make} xetest 2>/dev/null | grep -v make`
2199 case "$proto_defines" in *NARROWPROTO* ) narrowproto=yes ;; esac
2200 fi
2201 cd ..
2202 rm -fr conftestdir
2203 fi
2204 test -z "$narrowproto" && narrowproto=no
2205 AC_MSG_RESULT($narrowproto)
2206 test "$narrowproto" = "yes" && AC_DEFINE(NARROWPROTO)
2207
2180 fi dnl $with_x11 = yes 2208 fi dnl $with_x11 = yes
2181 2209
2182 test -z "$window_system" && window_system="none" 2210 test -z "$window_system" && window_system="none"
2183 2211
2184 if test "$window_system" = "none" ; then 2212 if test "$window_system" = "none" ; then
2210 test "$opsys" = "hpux9" && opsysfile="s/hpux9-x11r4.h" 2238 test "$opsys" = "hpux9" && opsysfile="s/hpux9-x11r4.h"
2211 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h" 2239 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
2212 esac 2240 esac
2213 2241
2214 dnl Autodetect Xauth 2242 dnl Autodetect Xauth
2243 dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
2215 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no 2244 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
2216 test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h, ,with_xauth=no) } 2245 test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h, ,with_xauth=no) }
2217 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no) } 2246 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no) }
2218 test -z "$with_xauth" && with_xauth=yes 2247 test -z "$with_xauth" && with_xauth=yes
2219 if test "$with_xauth" = "yes"; then 2248 if test "$with_xauth" = "yes"; then
2220 AC_DEFINE(HAVE_XAUTH) 2249 AC_DEFINE(HAVE_XAUTH)
2221 XE_PREPEND(-lXau, libs_x) 2250 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
2222 fi 2251 fi
2252 AC_SUBST(libs_xauth)
2223 2253
2224 dnl Autodetect OffiX 2254 dnl Autodetect OffiX
2225 test -z "$with_offix" && { AC_CHECK_HEADER(OffiX/DragAndDrop.h, , with_offix=no) } 2255 test -z "$with_offix" && { AC_CHECK_HEADER(OffiX/DragAndDrop.h, , with_offix=no) }
2226 test -z "$with_offix" && { AC_CHECK_LIB(Dnd, DndInitialize, [:] , with_offix=no) } 2256 test -z "$with_offix" && { AC_CHECK_LIB(Dnd, DndInitialize, [:] , with_offix=no) }
2227 test -z "$with_offix" && with_offix=yes 2257 test -z "$with_offix" && with_offix=yes
2297 AC_DEFINE(HAVE_GIF) 2327 AC_DEFINE(HAVE_GIF)
2298 XE_ADD_OBJS(dgif_lib.o gif_err.o gifalloc.o) 2328 XE_ADD_OBJS(dgif_lib.o gif_err.o gifalloc.o)
2299 fi 2329 fi
2300 2330
2301 dnl Autodetect Xpm 2331 dnl Autodetect Xpm
2302 test -z "$with_xpm" && { AC_CHECK_HEADER(X11/xpm.h, ,with_xpm=no) } 2332 AC_MSG_CHECKING(for Xpm)
2303 test -z "$with_xpm" && { AC_CHECK_LIB(Xpm, XpmFree,[:],with_xpm=no) } 2333 xe_check_libs=-lXpm
2304 test -z "$with_xpm" && with_xpm=yes 2334 test -z "$with_xpm" && { AC_TRY_RUN([#include <X11/xpm.h>
2335 int main(int argc, char *argv[]) {
2336 return (XpmIncludeVersion != XpmLibraryVersion()) ||
2337 XpmIncludeVersion < 30406;
2338 }], with_xpm=yes, with_xpm=no)
2339 }
2340 xe_check_libs=
2341 AC_MSG_RESULT($with_xpm)
2305 if test "$with_xpm" = "yes"; then 2342 if test "$with_xpm" = "yes"; then
2306 AC_DEFINE(HAVE_XPM) 2343 AC_DEFINE(HAVE_XPM)
2307 XE_PREPEND(-lXpm, libs_x) 2344 XE_PREPEND(-lXpm, libs_x)
2308 fi 2345 fi
2309 2346
2460 fi 2497 fi
2461 fi dnl with_xim 2498 fi dnl with_xim
2462 2499
2463 dnl Autodetect WNN 2500 dnl Autodetect WNN
2464 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support 2501 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
2465 test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) } 2502 test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) }
2466 test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list_e, ,[:],with_wnn=no) } 2503 test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list_e,[:],with_wnn=no) }
2467 test -z "$with_wnn" && with_wnn=yes 2504 test -z "$with_wnn" && with_wnn=yes
2468 if test "$with_wnn" = "yes"; then 2505 if test "$with_wnn" = "yes"; then
2469 AC_DEFINE(HAVE_WNN) 2506 AC_DEFINE(HAVE_WNN)
2470 XE_PREPEND(-lwnn, libs_x) 2507 XE_PREPEND(-lwnn, libs_x)
2471 XE_ADD_OBJS(mule-wnnfns.o) 2508 XE_ADD_OBJS(mule-wnnfns.o)
2702 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"` 2739 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"`
2703 if test -z "$version"; then 2740 if test -z "$version"; then
2704 echo "$progname: can't find current emacs version in \"$file\"." >&2 2741 echo "$progname: can't find current emacs version in \"$file\"." >&2
2705 exit 1 2742 exit 1
2706 fi 2743 fi
2707 beta=`sed -ne 's/^.*XEmacs Lucid (beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"` 2744 beta=`sed -ne 's/^.*beta.*(beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"`
2708 test -n "$beta" && version="${version}-b${beta}" 2745 test -n "$beta" && version="${version}-b${beta}"
2709 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 2746 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
2710 main_1_id="`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`" 2747 main_1_id=`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`
2711 AC_DEFINE_UNQUOTED(main_1, $main_1_id) 2748 AC_DEFINE_UNQUOTED(main_1, $main_1_id)
2712 2749
2713 2750
2714 dnl Check for sound of various sorts. 2751 dnl Check for sound of various sorts.
2715 2752
3293 3330
3294 dnl This has to be called in order for this variable to get into config.status 3331 dnl This has to be called in order for this variable to get into config.status
3295 AC_SUBST(internal_makefile_list) 3332 AC_SUBST(internal_makefile_list)
3296 # Remove any trailing slashes in these variables. 3333 # Remove any trailing slashes in these variables.
3297 test -n "$prefix" && 3334 test -n "$prefix" &&
3298 prefix=`echo "$prefix" | sed 's,\([[^/]]\)/*$,\1,'` 3335 prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'`
3299 test -n "$exec_prefix" && 3336 test -n "$exec_prefix" &&
3300 exec_prefix=`echo "$exec_prefix" | sed 's,\([[^/]]\)/*$,\1,'` 3337 exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'`
3301 3338
3302 dnl Build Makefile.in's from Makefile.in.in's 3339 dnl Build Makefile.in's from Makefile.in.in's
3303 dnl except ./Makefile from $srcdir/Makefile.in 3340 dnl except ./Makefile from $srcdir/Makefile.in
3304 3341
3305 AC_OUTPUT($internal_makefile_list,[ 3342 AC_OUTPUT($internal_makefile_list,[