Mercurial > hg > xemacs-beta

comparison configure.in @ 201:eb5470882647 r20-3b27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b27
author cvs
date Mon, 13 Aug 2007 10:01:22 +0200
parents acd284d43ca1
children 850242ba4a81
comparison
equal deleted inserted replaced
200:f0deb0c0e6be 201:eb5470882647
192 ac_ext=c 192 ac_ext=c
193 dnl CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 193 dnl CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
194 dnl ac_cpp='$CPP $CPPFLAGS' 194 dnl ac_cpp='$CPP $CPPFLAGS'
195 dnl ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' 195 dnl ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC'
196 dnl ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' 196 dnl ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
197 dnl # $c_switch_x_machine $c_switch_x_system
198 dnl # $ld_switch_x_machine $ld_switch_x_system
199 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' 197 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
200 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' 198 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
201 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard' 199 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
202 ac_cpp='$CPP '"$xe_cppflags" 200 ac_cpp='$CPP '"$xe_cppflags"
203 ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC' 201 ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC'
1741 CPP_to_sh(OBJECTS_MACHINE, objects_machine) 1739 CPP_to_sh(OBJECTS_MACHINE, objects_machine)
1742 CPP_to_sh(OBJECTS_SYSTEM, objects_system) 1740 CPP_to_sh(OBJECTS_SYSTEM, objects_system)
1743 1741
1744 CPP_to_sh(C_SWITCH_MACHINE, c_switch_machine) 1742 CPP_to_sh(C_SWITCH_MACHINE, c_switch_machine)
1745 CPP_to_sh(C_SWITCH_SYSTEM, c_switch_system) 1743 CPP_to_sh(C_SWITCH_SYSTEM, c_switch_system)
1746 CPP_to_sh(C_SWITCH_X_SYSTEM, c_switch_x_system)
1747 1744
1748 CPP_to_sh(LD_SWITCH_MACHINE, ld_switch_machine) 1745 CPP_to_sh(LD_SWITCH_MACHINE, ld_switch_machine)
1749 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system) 1746 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system)
1750 CPP_to_sh(LD_SWITCH_X_SYSTEM, ld_switch_x_system)
1751 1747
1752 CPP_to_sh(UNEXEC, unexec, unexec.o) 1748 CPP_to_sh(UNEXEC, unexec, unexec.o)
1753 1749
1754 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c) 1750 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c)
1755 1751
1836 1832
1837 dnl For debugging... 1833 dnl For debugging...
1838 test "$extra_verbose" = "yes" && \ 1834 test "$extra_verbose" = "yes" && \
1839 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard 1835 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
1840 objects_machine objects_system c_switch_machine c_switch_system 1836 objects_machine objects_system c_switch_machine c_switch_system
1841 c_switch_x_system ld_switch_machine ld_switch_system 1837 ld_switch_machine ld_switch_system unexec ld_switch_shared
1842 ld_switch_x_system unexec ld_switch_shared
1843 ld lib_gcc ld_text_start_addr start_files ordinary_link 1838 ld lib_gcc ld_text_start_addr start_files ordinary_link
1844 have_terminfo mail_use_flock mail_use_lockf) && echo "" 1839 have_terminfo mail_use_flock mail_use_lockf) && echo ""
1845 1840
1846 dnl Non-ordinary link usually requires -lc 1841 dnl Non-ordinary link usually requires -lc
1847 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" 1842 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
2591 done 2586 done
2592 fi 2587 fi
2593 test -z "$with_tiff" && with_tiff=no 2588 test -z "$with_tiff" && with_tiff=no
2594 if test "$with_tiff" = "yes"; then 2589 if test "$with_tiff" = "yes"; then
2595 AC_DEFINE(HAVE_TIFF) 2590 AC_DEFINE(HAVE_TIFF)
2596 XE_PREPEND(-ltiff, libs_x) 2591 XE_PREPEND($tiff_libs, libs_x)
2597 fi 2592 fi
2598 2593
2599 dnl Autodetect -lXaw 2594 dnl Autodetect -lXaw
2600 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no) 2595 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no)
2601 if test "$have_xaw" = "yes"; then 2596 if test "$have_xaw" = "yes"; then
3080 fi 3075 fi
3081 3076
3082 case "$with_sound" in both | nas ) 3077 case "$with_sound" in both | nas )
3083 AC_DEFINE(HAVE_NAS_SOUND) 3078 AC_DEFINE(HAVE_NAS_SOUND)
3084 XE_ADD_OBJS(nas.o) 3079 XE_ADD_OBJS(nas.o)
3085 XE_PREPEND(-laudio, LIBS) 3080 XE_PREPEND(-laudio, libs_x)
3086 dnl If the nas library does not contain the error jump point, 3081 dnl If the nas library does not contain the error jump point,
3087 dnl then we force safer behaviour. 3082 dnl then we force safer behaviour.
3088 AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[AC_DEFINE(NAS_NO_ERROR_JUMP)]) 3083 AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[AC_DEFINE(NAS_NO_ERROR_JUMP)])
3089 esac 3084 esac
3090 3085