Mercurial > hg > xemacs-beta

comparison configure.in @ 276:6330739388db r21-0b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b36
author cvs
date Mon, 13 Aug 2007 10:30:37 +0200
parents ca9a9ec9c1c1
children 90d73dddcdc4
comparison
equal deleted inserted replaced
275:a68ae4439f57 276:6330739388db
287 MFLAGS= MAKEFLAGS= 287 MFLAGS= MAKEFLAGS=
288 dnl Maximum number of lines to put in a shell here document. 288 dnl Maximum number of lines to put in a shell here document.
289 ac_max_here_lines=12 289 ac_max_here_lines=12
290 ])dnl 290 ])dnl
291 AC_INIT(src/lisp.h)dnl 291 AC_INIT(src/lisp.h)dnl
292 AC_CONFIG_HEADER(src/config.h src/paths.h lwlib/config.h) 292 AC_CONFIG_HEADER(src/config.h lwlib/config.h)
293 dnl Remove any more than one leading "." element from the path name. 293 dnl Remove any more than one leading "." element from the path name.
294 dnl If we do not remove them, then another "./" will be prepended to 294 dnl If we do not remove them, then another "./" will be prepended to
295 dnl the file name each time we use config.status, and the program name 295 dnl the file name each time we use config.status, and the program name
296 dnl will get larger and larger. This would not be a problem, except 296 dnl will get larger and larger. This would not be a problem, except
297 dnl that since progname gets recorded in all the Makefiles this script 297 dnl that since progname gets recorded in all the Makefiles this script
323 statedir='${prefix}/lib' 323 statedir='${prefix}/lib'
324 libdir='${exec_prefix}/lib' 324 libdir='${exec_prefix}/lib'
325 mandir='${prefix}/man/man1' 325 mandir='${prefix}/man/man1'
326 infodir='${datadir}/xemacs-${version}/info' 326 infodir='${datadir}/xemacs-${version}/info'
327 infopath='' 327 infopath=''
328 install_pp=''
328 lispdir='${datadir}/xemacs-${version}/lisp' 329 lispdir='${datadir}/xemacs-${version}/lisp'
329 sitelispdir='${datadir}/xemacs/site-lisp' 330 sitelispdir='${datadir}/xemacs/site-lisp'
330 pkgdir='${datadir}/xemacs-${version}/lisp' 331 pkgdir='${datadir}/xemacs-${version}/lisp'
331 package_path='' 332 package_path=''
332 etcdir='${datadir}/xemacs-${version}/etc' 333 etcdir='${datadir}/xemacs-${version}/etc'
1569 configure___ [$2]=no 1570 configure___ [$2]=no
1570 [#]endif 1571 [#]endif
1571 ]) 1572 ])
1572 1573
1573 1574
1575 echo > $tempcname
1576
1574 echo ' 1577 echo '
1575 #define NOT_C_CODE 1578 #define NOT_C_CODE
1576 #define C_SWITCH_SITE 1579 #define C_SWITCH_SITE
1577 #define C_SWITCH_X_SITE 1580 #define C_SWITCH_X_SITE
1578 #define LD_SWITCH_SITE 1581 #define LD_SWITCH_SITE
1585 CPP_to_sh(LIBS_MACHINE, libs_machine) 1588 CPP_to_sh(LIBS_MACHINE, libs_machine)
1586 CPP_to_sh(LIBS_SYSTEM, libs_system) 1589 CPP_to_sh(LIBS_SYSTEM, libs_system)
1587 CPP_to_sh(LIBS_TERMCAP, libs_termcap) 1590 CPP_to_sh(LIBS_TERMCAP, libs_termcap)
1588 CPP_to_sh(LIB_STANDARD, libs_standard) 1591 CPP_to_sh(LIB_STANDARD, libs_standard)
1589 1592
1593 ' >> $tempcname
1594 echo '
1595
1590 CPP_to_sh(OBJECTS_MACHINE, objects_machine) 1596 CPP_to_sh(OBJECTS_MACHINE, objects_machine)
1591 CPP_to_sh(OBJECTS_SYSTEM, objects_system) 1597 CPP_to_sh(OBJECTS_SYSTEM, objects_system)
1592 1598
1593 CPP_to_sh(C_SWITCH_MACHINE, c_switch_machine) 1599 CPP_to_sh(C_SWITCH_MACHINE, c_switch_machine)
1594 CPP_to_sh(C_SWITCH_SYSTEM, c_switch_system) 1600 CPP_to_sh(C_SWITCH_SYSTEM, c_switch_system)
1597 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system) 1603 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system)
1598 1604
1599 CPP_to_sh(UNEXEC, unexec, unexec.o) 1605 CPP_to_sh(UNEXEC, unexec, unexec.o)
1600 1606
1601 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c) 1607 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c)
1608
1609 ' >> $tempcname
1610 echo '
1602 1611
1603 #ifdef ORDINARY_LINK 1612 #ifdef ORDINARY_LINK
1604 #define LD "$(CC) $(CFLAGS)" 1613 #define LD "$(CC) $(CFLAGS)"
1605 #else /* no ORDINARY LINK */ 1614 #else /* no ORDINARY LINK */
1606 #ifdef COFF_ENCAPSULATE 1615 #ifdef COFF_ENCAPSULATE
1615 #endif /* not ORDINARY_LINK */ 1624 #endif /* not ORDINARY_LINK */
1616 configure___ ld=LD 1625 configure___ ld=LD
1617 1626
1618 CPP_to_sh(LIB_GCC, lib_gcc) 1627 CPP_to_sh(LIB_GCC, lib_gcc)
1619 CPP_to_sh(LD_TEXT_START_ADDR, ld_text_start_addr) 1628 CPP_to_sh(LD_TEXT_START_ADDR, ld_text_start_addr)
1629
1630 ' >> $tempcname
1631 echo '
1620 1632
1621 #if ! defined (ORDINARY_LINK) && !defined (START_FILES) 1633 #if ! defined (ORDINARY_LINK) && !defined (START_FILES)
1622 #ifdef NO_REMAP 1634 #ifdef NO_REMAP
1623 #ifdef COFF_ENCAPSULATE 1635 #ifdef COFF_ENCAPSULATE
1624 #define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o" 1636 #define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o"
1638 CPP_boolean_to_sh(SYSTEM_MALLOC, system_malloc) 1650 CPP_boolean_to_sh(SYSTEM_MALLOC, system_malloc)
1639 CPP_boolean_to_sh(TERMINFO, have_terminfo) 1651 CPP_boolean_to_sh(TERMINFO, have_terminfo)
1640 CPP_boolean_to_sh(MAIL_USE_FLOCK, mail_use_flock) 1652 CPP_boolean_to_sh(MAIL_USE_FLOCK, mail_use_flock)
1641 CPP_boolean_to_sh(MAIL_USE_LOCKF, mail_use_lockf) 1653 CPP_boolean_to_sh(MAIL_USE_LOCKF, mail_use_lockf)
1642 1654
1643 ' > $tempcname 1655 ' >> $tempcname
1644 dnl The value of CPP is a quoted variable reference, so we need to do this 1656 dnl The value of CPP is a quoted variable reference, so we need to do this
1645 dnl to get its actual value... 1657 dnl to get its actual value...
1646 CPP=`eval "echo $CPP"` 1658 CPP=`eval "echo $CPP"`
1647 define(TAB, [ ])dnl 1659 define(TAB, [ ])dnl
1648 changequote(, )dnl 1660 changequote(, )dnl
2344 if test "$with_msw" != "no"; then 2356 if test "$with_msw" != "no"; then
2345 AC_CHECKING(for MS-Windows) 2357 AC_CHECKING(for MS-Windows)
2346 AC_CHECK_LIB(gdi32,main,with_msw=yes) 2358 AC_CHECK_LIB(gdi32,main,with_msw=yes)
2347 if test "$with_msw" = "yes"; then 2359 if test "$with_msw" = "yes"; then
2348 AC_DEFINE(HAVE_MS_WINDOWS) 2360 AC_DEFINE(HAVE_MS_WINDOWS)
2349 XE_APPEND(-lshell32 -lgdi32 -luser32, libs_system) 2361 install_pp="$blddir/lib-src/installexe.sh"
2362 XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system)
2350 if test "$window_system" != x11; then 2363 if test "$window_system" != x11; then
2351 window_system=msw 2364 window_system=msw
2352 test "$with_scrollbars" != "no" && with_scrollbars=msw \ 2365 test "$with_scrollbars" != "no" && with_scrollbars=msw \
2353 && XE_ADD_OBJS(scrollbar-msw.o) 2366 && XE_ADD_OBJS(scrollbar-msw.o)
2354 test "$with_menubars" != "no" && with_menubars=msw \ 2367 test "$with_menubars" != "no" && with_menubars=msw \
2355 && XE_ADD_OBJS(menubar-msw.o) 2368 && XE_ADD_OBJS(menubar-msw.o)
2369 test "$with_toolbars" != "no" && with_toolbars=msw \
2370 && XE_ADD_OBJS(toolbar-msw.o)
2356 with_dialogs=msw 2371 with_dialogs=msw
2357 with_toolbars=no
2358 else 2372 else
2359 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o) 2373 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
2360 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o) 2374 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o)
2375 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o)
2361 fi 2376 fi
2362 const_is_losing=no 2377 const_is_losing=no
2363 with_file_coding=yes 2378 with_file_coding=yes
2364 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o) 2379 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o)
2365 fi 2380 fi
2366 fi 2381 fi
2382
2383 AC_SUBST(install_pp)
2367 2384
2368 test -z "$window_system" && window_system="none" 2385 test -z "$window_system" && window_system="none"
2369 2386
2370 dnl Test for features that require a window system - ANY window system 2387 dnl Test for features that require a window system - ANY window system
2371 if test "$window_system" = "none"; then 2388 if test "$window_system" = "none"; then
3364 AC_DEFINE(HAVE_SHLIB) 3381 AC_DEFINE(HAVE_SHLIB)
3365 XE_ADD_OBJS(sysdll.o) 3382 XE_ADD_OBJS(sysdll.o)
3366 XE_ADD_OBJS(dll.o) 3383 XE_ADD_OBJS(dll.o)
3367 test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS) 3384 test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS)
3368 XE_MAKE_SHAREDLIB 3385 XE_MAKE_SHAREDLIB
3386 AC_CHECK_FUNCS(dlerror)
3369 ld_dynamic_link_flags= 3387 ld_dynamic_link_flags=
3370 dnl Fill this in with other values as this gets more testing 3388 dnl Fill this in with other values as this gets more testing
3371 case "$opsys" in 3389 case "$opsys" in
3372 hpux*) ld_dynamic_link_flags="-Wl,-E" ;; 3390 hpux*) ld_dynamic_link_flags="-Wl,-E" ;;
3373 linux*) ld_dynamic_link_flags="-rdynamic" ;; 3391 linux*) ld_dynamic_link_flags="-rdynamic" ;;
3834 for file in $internal_makefile_list; do 3852 for file in $internal_makefile_list; do
3835 test "$file" = src/Makefile.in && \ 3853 test "$file" = src/Makefile.in && \
3836 file="src/Makefile.in:src/Makefile.in.in:src/depend" 3854 file="src/Makefile.in:src/Makefile.in.in:src/depend"
3837 ac_output_files="${ac_output_files+$ac_output_files }$file" 3855 ac_output_files="${ac_output_files+$ac_output_files }$file"
3838 done 3856 done
3839 ac_output_files="$ac_output_files src/paths.h.in lib-src/config.values" 3857 ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
3840 3858
3841 AC_OUTPUT($ac_output_files, 3859 AC_OUTPUT($ac_output_files,
3842 [for dir in $MAKE_SUBDIR; do 3860 [for dir in $MAKE_SUBDIR; do
3843 echo creating $dir/Makefile 3861 echo creating $dir/Makefile
3844 ( 3862 (