comparison configure.in @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32
author cvs
date Mon, 13 Aug 2007 11:16:07 +0200
parents a86b2b5e0111
children b8cc9ab3f761
comparison
equal deleted inserted replaced
403:9f011ab08d48 404:2f8bb876ab1d
305 mandir='${prefix}/man' 305 mandir='${prefix}/man'
306 306
307 dnl Initialize some other variables. 307 dnl Initialize some other variables.
308 subdirs= 308 subdirs=
309 MFLAGS= MAKEFLAGS= 309 MFLAGS= MAKEFLAGS=
310 SHELL=${CONFIG_SHELL-/bin/sh}
310 dnl Maximum number of lines to put in a shell here document. 311 dnl Maximum number of lines to put in a shell here document.
311 ac_max_here_lines=12 312 ac_max_here_lines=12
312 ])dnl AC_INIT_PARSE_ARGS 313 ])dnl AC_INIT_PARSE_ARGS
313 314
314 AC_INIT(src/lisp.h)dnl 315 AC_INIT(src/lisp.h)dnl
503 with_wnn6 | \ 504 with_wnn6 | \
504 with_workshop | \ 505 with_workshop | \
505 with_sparcworks | \ 506 with_sparcworks | \
506 with_tooltalk | \ 507 with_tooltalk | \
507 with_ldap | \ 508 with_ldap | \
509 with_postgresql | \
508 with_pop | \ 510 with_pop | \
509 with_kerberos | \ 511 with_kerberos | \
510 with_hesiod | \ 512 with_hesiod | \
511 with_dnet | \ 513 with_dnet | \
512 with_infodock | \ 514 with_infodock | \
998 PROGNAME=infodock 1000 PROGNAME=infodock
999 CPPFLAGS="$CPPFLAGS -DINFODOCK" 1001 CPPFLAGS="$CPPFLAGS -DINFODOCK"
1000 else 1002 else
1001 PROGNAME=xemacs 1003 PROGNAME=xemacs
1002 fi 1004 fi
1005
1006 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME")
1003 1007
1004 dnl ---------------------------------- 1008 dnl ----------------------------------
1005 dnl Error checking and debugging flags 1009 dnl Error checking and debugging flags
1006 dnl ---------------------------------- 1010 dnl ----------------------------------
1007 dnl Error checking default to "yes" in beta versions, to "no" in releases. 1011 dnl Error checking default to "yes" in beta versions, to "no" in releases.
1945 XE_PROTECT_LINKER_FLAGS(ld_call_shared) 1949 XE_PROTECT_LINKER_FLAGS(ld_call_shared)
1946 1950
1947 dnl Add s&m-determined objects (including unexec) to link line 1951 dnl Add s&m-determined objects (including unexec) to link line
1948 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine) 1952 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine)
1949 test -n "$objects_system" && XE_ADD_OBJS($objects_system) 1953 test -n "$objects_system" && XE_ADD_OBJS($objects_system)
1950 test -n "$unexec" && XE_ADD_OBJS($unexec) 1954 test -n "$unexec" && test ! "$pdump" = "yes" && XE_ADD_OBJS($unexec)
1955 test "$pdump" = "yes" && XE_ADD_OBJS(dumper.o)
1951 1956
1952 dnl Dynodump (Solaris 2.x, x<6) 1957 dnl Dynodump (Solaris 2.x, x<6)
1953 AC_MSG_CHECKING(for dynodump) 1958 AC_MSG_CHECKING(for dynodump)
1954 if test "$unexec" != "unexsol2.o"; then 1959 if test "$unexec" != "unexsol2.o"; then
1955 AC_MSG_RESULT(no) 1960 AC_MSG_RESULT(no)
2894 fi 2899 fi
2895 XE_PREPEND(-llber, LIBS) 2900 XE_PREPEND(-llber, LIBS)
2896 XE_PREPEND(-lldap, LIBS) 2901 XE_PREPEND(-lldap, LIBS)
2897 fi 2902 fi
2898 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) 2903 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
2904 fi
2905
2906 dnl Autodetect PostgreSQL
2907 dnl The default installation location (non-Linux) is /usr/local/pgsql;
2908 dnl a different prefix can be selected at build/install time. If PostgreSQL
2909 dnl is installed into a different prefix, that prefix must be specified in
2910 dnl in the --site-prefixes flag.
2911 dnl The default RPM-based Linux installation location is /usr.
2912 AC_CHECKING(for PostgreSQL)
2913 postgres_includes_found=no
2914 save_c_switch_site="$c_switch_site"
2915 dnl First check site prefixes
2916 if test "$with_postgresql" != "no"; then
2917 AC_CHECK_HEADER(libpq-fe.h,postgres_includes_found=yes)
2918 fi
2919 dnl test for Linux-style installation in /usr
2920 if test "$postgres_includes_found" = "no" -a "$with_postgresql" != "no" -a \
2921 -d "/usr/include/pgsql"; then
2922 c_switch_site="$c_switch_site -I/usr/include/pgsql"
2923 AC_CHECK_HEADER(libpq-fe.h,postgres_includes_found=yes)
2924 if test "$postgres_includes_found" != "yes"; then
2925 c_switch_site="$save_c_switch_site"
2926 fi
2927 fi
2928 if test "$postgres_includes_found" = "no" -a "$with_postgresql" != "no" -a \
2929 -d "/usr/local/pgsql/include"; then
2930 c_switch_site="$c_switch_site -I/usr/local/pgsql/include"
2931 AC_CHECK_HEADER(libpq-fe.h,postgres_includes_found=yes)
2932 if test "$postgres_includes_found" != "yes"; then
2933 c_switch_site="$save_c_switch_site"
2934 fi
2935 fi
2936
2937 dnl last check -- can we link against libpq?
2938 if test "$postgres_includes_found" = "yes"; then
2939 AC_CHECK_LIB(pq,PQconnectdb,with_postgresql=yes,with_postgresql=no)
2940 fi
2941 if test "$with_postgresql" = "yes"; then
2942 AC_CHECK_LIB(pq,PQconnectStart,with_postgresqlv7=yes,with_postgresqlv7=no)
2943 fi
2944 if test "$with_postgresql" = "yes"; then
2945 AC_DEFINE(HAVE_POSTGRESQL)
2946 if test "$with_postgresqlv7" = "yes"; then
2947 AC_DEFINE(HAVE_POSTGRESQLV7)
2948 fi
2949 XE_PREPEND(-lpq, LIBS)
2950 XE_ADD_OBJS(postgresql.o)
2951 else
2952 c_switch_site=$save_c_switch_site
2899 fi 2953 fi
2900 2954
2901 dnl ---------------------- 2955 dnl ----------------------
2902 dnl Graphics libraries 2956 dnl Graphics libraries
2903 dnl ---------------------- 2957 dnl ----------------------
3513 AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)]) 3567 AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)])
3514 fi 3568 fi
3515 3569
3516 3570
3517 AC_C_INLINE 3571 AC_C_INLINE
3518 if test "$ac_cv_c_inline" != "no"; then 3572 test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
3519 AC_DEFINE(HAVE_INLINE)
3520 test "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
3521 fi
3522 3573
3523 dnl HP-UX has a working alloca in libPW. 3574 dnl HP-UX has a working alloca in libPW.
3524 dnl case "${GCC}${opsys}" in hpux* ) 3575 dnl case "${GCC}${opsys}" in hpux* )
3525 dnl AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)]) 3576 dnl AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)])
3526 dnl esac 3577 dnl esac
4475 test "$with_database_dbm" = yes && echo " Compiling in support for DBM." 4526 test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
4476 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM." 4527 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
4477 4528
4478 test "$with_ldap" = yes && echo " Compiling in support for LDAP." 4529 test "$with_ldap" = yes && echo " Compiling in support for LDAP."
4479 4530
4531 if test "$with_postgresql" = yes; then
4532 echo " Compiling in support for PostgreSQL."
4533 if test "$with_postgresqlv7" = yes; then
4534 echo " Using PostgreSQL V7 bindings."
4535 fi
4536 fi
4480 test "$with_ncurses" = yes && echo " Compiling in support for ncurses." 4537 test "$with_ncurses" = yes && echo " Compiling in support for ncurses."
4481 test "$with_gpm" = yes && echo " Compiling in support for GPM (General Purpose Mouse)." 4538 test "$with_gpm" = yes && echo " Compiling in support for GPM (General Purpose Mouse)."
4482 4539
4483 test "$with_mule" = yes && echo " Compiling in Mule (multi-lingual) support." 4540 test "$with_mule" = yes && echo " Compiling in Mule (multi-lingual) support."
4484 test "$with_file_coding" = yes && echo " Compiling in File coding support." 4541 test "$with_file_coding" = yes && echo " Compiling in File coding support."
4537 echo " movemail will use \"$mail_locking\" for locking mail spool files." 4594 echo " movemail will use \"$mail_locking\" for locking mail spool files."
4538 test "$with_pop" = yes && echo " Using POP for mail access." 4595 test "$with_pop" = yes && echo " Using POP for mail access."
4539 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication." 4596 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication."
4540 test "$with_hesiod" = yes && echo " Using Hesiod to get POP server host." 4597 test "$with_hesiod" = yes && echo " Using Hesiod to get POP server host."
4541 test "$use_union_type" = yes && echo " Using the union type for Lisp_Objects." 4598 test "$use_union_type" = yes && echo " Using the union type for Lisp_Objects."
4542 test "$pdump" = yes && echo " Using the new portable dumper (wishful thinking)." 4599 test "$pdump" = yes && echo " Using the new portable dumper."
4543 test "$debug" = yes && echo " Compiling in extra code for debugging." 4600 test "$debug" = yes && echo " Compiling in extra code for debugging."
4544 test "$usage_tracking" = yes && echo " Compiling with usage tracking active (Sun internal)." 4601 test "$usage_tracking" = yes && echo " Compiling with usage tracking active (Sun internal)."
4545 if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \ 4602 if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \
4546 != "no no no no no"; then 4603 != "no no no no no"; then
4547 echo " WARNING: ---------------------------------------------------------" 4604 echo " WARNING: ---------------------------------------------------------"