User: stephent Date: 05/11/07 09:49:28 Modified: xemacs/src inline.c ChangeLog Log: Various small patches (also commit configure): Minor improvements to INSTALL <877jbk3nkk.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Add description of changed options to INSTALL <873bm83ncd.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Check for libpq (PostgreSQL) linking against SSL and crypto <87y8402820.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Include module INLINE_HEADERs in inline.c unconditionally <87u0eo27rn.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Fix use of AC_INIT <87pspc27oh.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Minor ChangeLog repairs <87ll0027jq.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path 1.259 +290 -193 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.258 retrieving revision 1.259 diff -u -p -r1.258 -r1.259 --- configure 2005/10/26 15:13:00 1.258 +++ configure 2005/11/07 08:49:12 1.259 ＠＠ -1,7 +1,9 ＠＠ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59 for XEmacs 21.5. # +# Report bugs to <xemacs-beta(a)xemacs.org&gt;. +# # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ＠＠ -312,11 +314,11 ＠＠ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='XEmacs' +PACKAGE_TARNAME='xemacs' +PACKAGE_VERSION='21.5' +PACKAGE_STRING='XEmacs 21.5' +PACKAGE_BUGREPORT=&#39;xemacs-beta(a)xemacs.org&#39; ac_unique_file="src/lisp.h" # Factoring default headers for most tests. ＠＠ -825,7 +827,7 ＠＠ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures XEmacs 21.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... ＠＠ -888,7 +890,9 ＠＠ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of XEmacs 21.5:";; + esac cat <<\_ACEOF Optional Features: ＠＠ -1135,6 +1139,7 ＠＠ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to <xemacs-beta(a)xemacs.org&gt;. _ACEOF fi ＠＠ -1230,6 +1235,8 ＠＠ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +XEmacs configure 21.5 +generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation ＠＠ -1289,7 +1296,7 ＠＠ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by XEmacs $as_me 21.5, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $＠ ＠＠ -1622,6 +1629,14 ＠＠ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + progname="`echo $0 | sed 's:^\./\./:\./:'`" MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi ＠＠ -10187,9 +10202,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -15654,9 +15669,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -17444,9 +17459,9 ＠＠ echo "$as_me: WARNING: Xm/Xm.h: proceedi echo "$as_me: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -17816,9 +17831,9 ＠＠ echo "$as_me: WARNING: X11/Intrinsic.h: echo "$as_me: WARNING: X11/Intrinsic.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -18409,9 +18424,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -19143,9 +19158,9 ＠＠ echo "$as_me: WARNING: X11/Xauth.h: proc echo "$as_me: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -19394,9 +19409,9 ＠＠ echo "$as_me: WARNING: dlfcn.h: proceedi echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -19697,9 +19712,9 ＠＠ echo "$as_me: WARNING: dl.h: proceeding echo "$as_me: WARNING: dl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -19947,9 +19962,9 ＠＠ echo "$as_me: WARNING: ltdl.h: proceedin echo "$as_me: WARNING: ltdl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -20967,9 +20982,9 ＠＠ echo "$as_me: WARNING: ${dir}tt_c.h: pro echo "$as_me: WARNING: ${dir}tt_c.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -21214,9 +21229,9 ＠＠ echo "$as_me: WARNING: Dt/Dt.h: proceedi echo "$as_me: WARNING: Dt/Dt.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -21504,9 +21519,9 ＠＠ echo "$as_me: WARNING: ldap.h: proceedin echo "$as_me: WARNING: ldap.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -21648,9 +21663,9 ＠＠ echo "$as_me: WARNING: lber.h: proceedin echo "$as_me: WARNING: lber.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -22271,9 +22286,9 ＠＠ echo "$as_me: WARNING: ${header_dir}libp echo "$as_me: WARNING: ${header_dir}libpq-fe.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -22297,7 +22312,10 ＠＠ fi done - test -n "$libpq_fe_h_file" && { echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5 + pq_libs= + extra_libs= + if test -n "$libpq_fe_h_file"; then + echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5 echo $ECHO_N "checking for PQconnectdb in -lpq... $ECHO_C" >&6 if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 ＠＠ -22362,9 +22380,86 ＠＠ fi echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectdb" >&5 echo "${ECHO_T}$ac_cv_lib_pq_PQconnectdb" >&6 if test $ac_cv_lib_pq_PQconnectdb = yes; then - have_libpq=yes + pq_libs="-lpq" +else + + unset ac_cv_lib_pq_PQconnectdb; + echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5 +echo $ECHO_N "checking for PQconnectdb in -lpq... $ECHO_C" >&6 +if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq -lcrypto -lssl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char PQconnectdb (); +int +main () +{ +PQconnectdb (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pq_PQconnectdb=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_pq_PQconnectdb=no fi - } +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectdb" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQconnectdb" >&6 +if test $ac_cv_lib_pq_PQconnectdb = yes; then + pq_libs="-lpq -lcrypto -lssl" +fi + +fi + + if test -z "$pq_libs"; then + have_libpq="no" + else + have_libpq="yes" + fi + fi if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then with_postgresql=yes ＠＠ -22378,7 +22473,7 ＠＠ if test "${ac_cv_lib_pq_PQconnectStart+s echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lpq $extra_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF ＠＠ -22443,13 +22538,15 ＠＠ if test $ac_cv_lib_pq_PQconnectStart = y #define HAVE_POSTGRESQLV7 1 _ACEOF +else + : fi cat >>confdefs.h <<_ACEOF #define LIBPQ_FE_H_FILE "$libpq_fe_h_file" _ACEOF - postgresql_libs="-lpq $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lpq\" to \$postgresql_libs"; fi + postgresql_libs="$pq_libs $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"$pq_libs\" to \$postgresql_libs"; fi MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi need_modules_common=yes if test "$enable_modules" = "yes"; then ＠＠ -22743,9 +22840,9 ＠＠ echo "$as_me: WARNING: compface.h: proce echo "$as_me: WARNING: compface.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -23185,9 +23282,9 ＠＠ echo "$as_me: WARNING: jpeglib.h: procee echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -23505,9 +23602,9 ＠＠ echo "$as_me: WARNING: png.h: proceeding echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -23791,9 +23888,9 ＠＠ echo "$as_me: WARNING: tiffio.h: proceed echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -24017,9 +24114,9 ＠＠ echo "$as_me: WARNING: compface.h: proce echo "$as_me: WARNING: compface.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -24565,9 +24662,9 ＠＠ echo "$as_me: WARNING: X11/Xaw/ThreeD.h: echo "$as_me: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -24824,9 +24921,9 ＠＠ echo "$as_me: WARNING: X11/$athena_varia echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -25027,9 +25124,9 ＠＠ echo "$as_me: WARNING: $athena_variant/T echo "$as_me: WARNING: $athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -25229,9 +25326,9 ＠＠ echo "$as_me: WARNING: X11/Xaw3d/ThreeD. echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -25435,9 +25532,9 ＠＠ echo "$as_me: WARNING: Xaw3d/ThreeD.h: p echo "$as_me: WARNING: Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -25587,9 +25684,9 ＠＠ echo "$as_me: WARNING: X11/Xaw/ThreeD.h: echo "$as_me: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -25749,9 +25846,9 ＠＠ echo "$as_me: WARNING: Xm/Xm.h: proceedi echo "$as_me: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -26240,9 +26337,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -26791,9 +26888,9 ＠＠ echo "$as_me: WARNING: wnn/jllib.h: proc echo "$as_me: WARNING: wnn/jllib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -26935,9 +27032,9 ＠＠ echo "$as_me: WARNING: wnn/commonhd.h: p echo "$as_me: WARNING: wnn/commonhd.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -27622,9 +27719,9 ＠＠ echo "$as_me: WARNING: canna/jrkanji.h: echo "$as_me: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -27769,9 +27866,9 ＠＠ echo "$as_me: WARNING: canna/jrkanji.h: echo "$as_me: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -27917,9 +28014,9 ＠＠ echo "$as_me: WARNING: canna/RK.h: proce echo "$as_me: WARNING: canna/RK.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -28807,9 +28904,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -28961,9 +29058,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -29111,9 +29208,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -29261,9 +29358,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -29414,9 +29511,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -29667,9 +29764,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -29922,9 +30019,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -30151,9 +30248,9 ＠＠ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -31707,9 +31804,9 ＠＠ echo "$as_me: WARNING: termios.h: procee echo "$as_me: WARNING: termios.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -31858,9 +31955,9 ＠＠ echo "$as_me: WARNING: termio.h: proceed echo "$as_me: WARNING: termio.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -32099,9 +32196,9 ＠＠ echo "$as_me: WARNING: netinet/in.h: pro echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -32237,9 +32334,9 ＠＠ echo "$as_me: WARNING: arpa/inet.h: proc echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -32593,9 +32690,9 ＠＠ echo "$as_me: WARNING: sys/ipc.h: procee echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -32731,9 +32828,9 ＠＠ echo "$as_me: WARNING: sys/msg.h: procee echo "$as_me: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -32882,9 +32979,9 ＠＠ echo "$as_me: WARNING: dirent.h: proceed echo "$as_me: WARNING: dirent.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -33025,9 +33122,9 ＠＠ echo "$as_me: WARNING: sys/dir.h: procee echo "$as_me: WARNING: sys/dir.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -33176,9 +33273,9 ＠＠ echo "$as_me: WARNING: nlist.h: proceedi echo "$as_me: WARNING: nlist.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -33329,9 +33426,9 ＠＠ echo "$as_me: WARNING: multimedia/audio_ echo "$as_me: WARNING: multimedia/audio_device.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -33677,9 +33774,9 ＠＠ echo "$as_me: WARNING: ${dir}/soundcard. echo "$as_me: WARNING: ${dir}/soundcard.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -33935,9 +34032,9 ＠＠ echo "$as_me: WARNING: audio/audiolib.h: echo "$as_me: WARNING: audio/audiolib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -34430,9 +34527,9 ＠＠ echo "$as_me: WARNING: ncurses/curses.h: echo "$as_me: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -34572,9 +34669,9 ＠＠ echo "$as_me: WARNING: ncurses/term.h: p echo "$as_me: WARNING: ncurses/term.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -34722,9 +34819,9 ＠＠ echo "$as_me: WARNING: ncurses/curses.h: echo "$as_me: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -35110,9 +35207,9 ＠＠ echo "$as_me: WARNING: gpm.h: proceeding echo "$as_me: WARNING: gpm.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -35348,9 +35445,9 ＠＠ echo "$as_me: WARNING: ndbm.h: proceedin echo "$as_me: WARNING: ndbm.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -36255,9 +36352,9 ＠＠ echo "$as_me: WARNING: gmp.h: proceeding echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -36480,9 +36577,9 ＠＠ echo "$as_me: WARNING: mp.h: proceeding echo "$as_me: WARNING: mp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## ------------------------------------- ## +## Report this to xemacs-beta(a)xemacs.org ## +## ------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ＠＠ -38063,7 +38160,7 ＠＠ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by XEmacs $as_me 21.5, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES ＠＠ -38126,7 +38223,7 ＠＠ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +XEmacs config.status 21.5 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" 1.18 +20 -4 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- configure.ac 2005/10/24 21:01:08 1.17 +++ configure.ac 2005/11/07 08:49:16 1.18 ＠＠ -24,7 +24,8 ＠＠ dnl macros, die if any version other tha AC_PREREQ(2.59)dnl m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1, [m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl -AC_INIT(src/lisp.h)dnl +AC_INIT([XEmacs],[21.5],[xemacs-beta(a)xemacs.org])dnl +AC_CONFIG_SRCDIR(src/lisp.h)dnl dnl dnl ------------------------------------------------------------------------- dnl Local copyright notices. ＠＠ -3707,16 +3708,31 ＠＠ dnl Look for these standard header file libpq_fe_h_file=${header_dir}libpq-fe.h; break) done - test -n "$libpq_fe_h_file" && { AC_CHECK_LIB(pq,PQconnectdb,have_libpq=yes) } + pq_libs= + extra_libs= + if test -n "$libpq_fe_h_file"; then + dnl #### Would it be nicer to do this with a loop? + dnl It seems unlikely that checking for SSL/crypto support can hurt, + dnl even if it's found. + AC_CHECK_LIB(pq, PQconnectdb,[pq_libs="-lpq"],[ + unset ac_cv_lib_pq_PQconnectdb; + AC_CHECK_LIB(pq, PQconnectdb,[pq_libs="-lpq -lcrypto -lssl"],, + [-lcrypto -lssl])]) + if test -z "$pq_libs"; then + have_libpq="no" + else + have_libpq="yes" + fi + fi if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then with_postgresql=yes AC_DEFINE(HAVE_POSTGRESQL) AC_CHECK_LIB(pq,PQconnectStart, [ with_postgresqlv7=yes; - AC_DEFINE(HAVE_POSTGRESQLV7)]) + AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs) AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file") - XE_PREPEND(-lpq, postgresql_libs) + XE_PREPEND([$pq_libs], postgresql_libs) XE_APPEND(modules/postgresql, MAKE_SUBDIR) need_modules_common=yes if test "$enable_modules" = "yes"; then 1.466 +16 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.465 retrieving revision 1.466 diff -u -p -r1.465 -r1.466 --- ChangeLog 2005/10/26 15:13:17 1.465 +++ ChangeLog 2005/11/07 08:49:17 1.466 ＠＠ -1,3 +1,19 ＠＠ +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.ac (AC_INIT): Use it correctly. + +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.ac (PostgreSQL): Check for link against SSL+crypto. + +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * INSTALL: Add map from old options as appendix. + +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * INSTALL: Various minor improvements. + 2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.23 "daikon" is released. 1.45 +253 -30 XEmacs/xemacs/INSTALL Index: INSTALL =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/INSTALL,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- INSTALL 2005/10/24 20:39:38 1.44 +++ INSTALL 2005/11/07 08:49:17 1.45 ＠＠ -16,8 +16,6 ＠＠ Copyright (c) 1994-1999, 2003 Free Softw and that any new or changed statements about the activities of the Free Software Foundation are approved by the Foundation. -Last modified by Stephen J. Turnbull <stephen(a)xemacs.org&gt; 2003-02-12 - BUILDING AND INSTALLATION FOR UNIX AND CYGWIN (for Microsoft Windows, see nt/README also.) ＠＠ -145,6 +143,11 ＠＠ Options are generally of the form `--wit program used in other applications, either `--with-FEATURE' or `--enable-FEATURE' can be used to use the same feature. +If you haven't built XEmacs 21.5 recently, the change from the +configure script based on Autoconf 2.13 can be a shock. Appendix: +Correspondence to Old Configure Options (at the end of this document) +contains a list of old options and their new equivalents. + Controlling the Host Type ------------------------- ＠＠ -205,22 +208,36 ＠＠ CFLAGS is consulted. If that is also un The `--with-cflags-warning=FLAGS' option specifies the warnings to be generated. There is normally no reason to use this flag, as XEmacs -turns on as many warnings as possible, and is still expected to build -with no, or at most a few warnings. +turns on as many warnings as possible, and is still intended to build +with no warnings. If you get any undocumented warnings, please report +them as bugs---they very often are, or at least indicate possible +bitrot. The `--with-cflags-optimization=FLAGS' option specifies the -optimizations to be used. There is normally no reason to use this flag, -as XEmacs will already set the maximum safe -optimization flags appropriate for the compiler being invoked. +optimizations to be used. There is normally no reason to use this +flag, as XEmacs will already set the maximum safe optimization flags +appropriate for the compiler being invoked. The `--with-cflags-debugging=FLAGS' option specifies debugging -information to be generated. There is normally no reason to use this -flag, as XEmacs will include debugging information whenever possible -(i.e. unless optimization is turned on and the compiler does not permit -debugging and optimization simultaneously). - -The `--with-dynamic' option specifies that configure should try to link -emacs dynamically rather than statically. +information to be generated. You should avoid using this flag, as it +makes most severe or fatal bugs hard-to-impossible to diagnose and +fix. Debugging information does not slow down XEmacs at runtime, and +it doesn't make the binary very much bigger. + +The `--with-dynamic' option specifies that configure should try to +link XEmacs dynamically rather than statically. `--with-static' +specifies the reverse. XEmacs's configure script detects whether +dynamic linking can be done on all platforms we know of; these options +are normally unnecessary. + +The `--with-modules' option specifies that XEmacs be built with +support for runtime loadable modules. NOTE TO OEMS: XEmacs can be +distributed configured to support several options based on external +APIs (currently LDAP, PostgreSQL, and Canna) as loadable modules. You +can distribute an XEmacs binary package with these options enabled +without depending on the external package. XEmacs will fail +gracefully at runtime, issuing an error message indicating that the +required support was not found on the system. You can build XEmacs for several different machine types from a single source directory. To do this, you must use a version of `make' that ＠＠ -275,27 +292,27 ＠＠ system has X Window System support, and The `--without-xmu' option can be used if your vendor doesn't ship the Xmu library. -The `--enable-menubars=TYPE' option allows you to specify which X +The `--with-menubars=TYPE' option allows you to specify which X toolkit you wish to use for the menubar. The valid options are `lucid', `motif' and `no'. The default is `lucid' which is a Motif-lookalike menubar. We highly recommend its usage over the real Motif menubar. (In fact, the Motif menubar is currently broken.) If `no' is specified then support for menubars will not be compiled in. -The `--enable-scrollbars=TYPE' option allows you to specify which X +The `--with-scrollbars=TYPE' option allows you to specify which X toolkit you wish to use for the scrollbars. The valid options are `lucid', `motif', `athena', `athena3d', and `no'. The default is `lucid' which is a Motif-lookalike scrollbar. If `no' is specified then support for scrollbars will not be compiled in. -The `--enable-dialogs=TYPE' option allows you to specify which X toolkit +The `--with-dialogs=TYPE' option allows you to specify which X toolkit you wish to use for the dialog boxes. The valid options are `athena', `athena3d', `motif, and `no. The `lucid' option is accepted and will result in the `athena' toolkit being used. If the Motif toolkit can be found the default is `motif'. Otherwise, the default is `athena'. If `no' is specified then support for dialog boxes will not be compiled in. -The `--enable-toolbars' option allows you to enable or disable toolbar +The `--with-toolbars' option allows you to enable or disable toolbar support. The default is `yes' if support for a windowing system is included. ＠＠ -307,38 +324,41 ＠＠ The `--with-xface' option specifies that X-Faces. `configure' will attempt to detect if you have the compface library and define `--with-xface' for you. -The `--enable-database' option specifies that XEmacs should be built +The `--with-database' option specifies that XEmacs should be built with simple database support. The valid options are `no' or a comma-separated list of one or more of `dbm', `gnudbm' or `berkdb'. `configure' will attempt to detect the necessary libraries and header -files and define `--enable-database' for you. +files and define `--with-database' for you. The `--with-postgresql' option specifies that XEmacs should be built with PostgreSQL support, linking with libpq. `configure' will attempt to detect whether PostgreSQL support is available, and automatically -define `--with-postgresql' for you. +define `--with-postgresql' for you. NOTE TO OEMS: If modules are +supported and enabled, the libpq API support will be build as a +module. The `--with-ldap' option specifies that XEmacs should be build with LDAP support, using the OpenLDAP libraries. `configure' will attempt to detect whether LDAP support is available, and automatically define -`--with-ldap' for you. +`--with-ldap' for you. NOTE TO OEMS: If modules are supported and +enabled, the OpenLDAP API support will be build as a module. The `--with-socks' option specifies that XEmacs should be built with SOCKS support. This requires the libsocks library. -The `--enable-external-widget' option specifies that XEmacs should be +The `--with-external-widget' option specifies that XEmacs should be built with support for being used as a widget by other X11 applications. This functionality should be considered beta. -The `--enable-sound=TYPE' option specifies that XEmacs should be built -with sound support. Native (`--enable-sound=native') sound support is +The `--with-sound=TYPE' option specifies that XEmacs should be built +with sound support. Native (`--with-sound=native') sound support is currently available only on Sun SparcStations, SGI's, HP9000s, and systems (such as Linux) with soundcard.h. Network Audio Support (NAS) -(`--enable-sound=nas') is an extension to X that you may or may not have +(`--with-sound=nas') is an extension to X that you may or may not have for your system. For NAS, you will probably need to provide the paths to the nas include and library directories to configure. If -`--enable-sound' is not specified, `configure' will attempt to determine -if your configuration supports native sound and define --enable-sound +`--with-sound' is not specified, `configure' will attempt to determine +if your configuration supports native sound and define --with-sound for you. If your native sound library is not in a standard location you can specify it with the `--with-native-sound-lib=LIB' flag. For Linux, `/dev/audio' is required for SunAudio files and `/dev/dsp' is required ＠＠ -368,7 +388,7 ＠＠ support can be explicitly disabled via t Internationalization Options ---------------------------- -The `--enable-mule' option enables MUlti-Lingual Emacs (Mule) support, +The `--with-mule' option enables MUlti-Lingual Emacs (Mule) support, needed to support non-Latin-1 (including Asian) languages. Mule support is required for Asian language and Unicode (multibyte and wide character) support. With the advent of the Euro and European ＠＠ -409,7 +429,8 ＠＠ still unknown. If Canna is already inst it, so you never need to explicitly use this option unless your Canna libraries are somewhere strange. Canna run time support is currently bundled with the `mule-base' package so there is nothing additional to -install in order to use it. +install in order to use it. NOTE TO OEMS: If modules are supported +and enabled, the libcanna API support will be build as a module. The `--with-wnn' and `--with-wnn6' options are for compiling with the Wnn multi-language input method. `--with-wnn' is for compiling with Wnn-4.2, ＠＠ -788,3 +809,205 ＠＠ without downloading some additional pack See the file PROBLEMS in this directory for a list of various problems sometimes encountered, and what to do about them. PROBLEMS is also the place where platform-specific build notes can be found. + +APPENDIX: CORRESPONDENCE TO OLD CONFIGURE OPTIONS +================================================= + +Here is a full translation of command line arguments. Note that any +option starting with "--with" may also be specified with "--enable". +This list may not be up-to-date. + +Old | New +------------------------------------------ +General options: +---------------- + +--help Unchanged +--usage Removed +--verbose Unchanged +--extra-verbose Removed + +Compilation options: +-------------------- + +--compiler --with-compiler +--xemacs-compiler --with-xemacs-compiler +--with-gcc Unchanged +--cflags --with-cflags +--cflags-warning --with-cflags-warning +--debug --with-debug +New --with-cflags-debug +New --with-optimization +New --with-cflags-optimization +--cpp --with-cpp +--cppflags --with-cppflags +--libs --with-libs +--ldflags --with-ldflags +--site-includes --with-site-includes +--site-libraries --with-site-libraries +--site-prefixes --with-site-prefixes +--site-runtime-libraries --with-site-runtime-libraries +--dynamic --with-dynamic +--srcdir Unchanged + +Installation options: +--------------------- + +--prefix Unchanged +--with-prefix Unchanged +--with-netinstall Unchanged +--bindir Unchanged +--datadir Unchanged +--statedir Unchanged +--libdir Unchanged +--infodir Unchanged +--mandir Unchanged +--lispdir --with-lispdir +--sitelispdir Removed +--etcdir --with-etcdir +--lockdir Removed +--archlibdir --with-archlibdir +--docdir --with-docdir +--moduledir --with-moduledir + +Run-time path-searching options: +-------------------------------- + +--with-site-lisp Unchanged +--with-site-modules Unchanged +--package-prefix --with-package-prefix +--package-path --with-package-path +--infopath --with-infopath + +Window-system options: +---------------------- + +--with-gtk Unchanged +--with-gnome Unchanged +--with-x11 Unchanged +--x-includes Unchanged +--x-libraries Unchanged +--with-msw Unchanged +--with-toolbars Unchanged +--with-wmcommand Unchanged +--with-athena Unchanged +--with-menubars Unchanged +--with-scrollbars Unchanged +--with-dialogs Unchanged +--with-widgets Unchanged +--with-dragndrop Unchanged +--with-cde Unchanged +--with-offix Unchanged +--with-xmu Unchanged +--external-widget --with-external-widget + +TTY (character terminal) options: +--------------------------------- + +--with-tty Unchanged +--with-ncurses Unchanged +--with-gpm Unchanged + +Image options: +-------------- + +--with-xpm Unchanged +--with-png Unchanged +--with-jpeg Unchanged +--with-tiff Unchanged +--with-xface Unchanged +--with-gif Unchanged + +Sound options: +-------------- + +--with-sound Unchanged +--native-sound-lib=LIB --with-native-sound-lib + +Internationalization options: +----------------------------- + +--with-mule Unchanged +--with-xim Unchanged +--with-canna Unchanged +--with-wnn Unchanged +--with-wnn6 Unchanged +--with-xfs Unchanged + +File-related options: +--------------------- + +--with-default-eol-detection Unchanged +--with-clash-detection Unchanged + +Database options: +----------------- + +--with-database Unchanged +--with-ldap Unchanged +--with-postgresql Unchanged + +Mail options: +------------- + +--mail-locking=TYPE --with-mail-locking +--with-pop Unchanged +--with-kerberos Unchanged +--with-hesiod Unchanged + +Networking options: +------------------- + +--with-tooltalk Unchanged +--with-socks Unchanged +--with-dnet Unchanged +--with-ipv6-cname Unchanged + +Memory allocation options: +-------------------------- + +--rel-alloc --with-rel-alloc +--with-dlmalloc Unchanged +--with-system-malloc Unchanged +--with-debug-malloc Unchanged + +Emacs Lisp options: +------------------- + +--use-number-lib --with-bignum + +Debugging options: +------------------ + +--debug --with-debug +--error-checking --with-error-checking +--memory-usage-stats --with-memory-usage-stats +--quick-build --with-quick-build +--use-union-type --with-union-type +--with-quantify Unchanged +--with-purify Unchanged + +Developer options: +------------------ + +--with-workshop Unchanged +--pdump --with-pdump +--use-kkcc --with-kkcc +--with-modules Unchanged + +The output files produced by this new configure should be almost +identical to those produced by the old. This can be tested with the +provided regression test script. This script runs the two versions of +configure with the supplied list of command line arguments and reports +any differences. Please add your favorite configuration command lines +to the list before running the test. The script is run as: + +$ tests/autoconf/regressiontest.pl /absolute/path/to/2.13/configure \ + /absolute/path/to/2.59/configure >diffs.txt + +The only differences should be: +- those related to changes in the command line arguments +- the change of SYS_SIGLIST_DECLARED to HAVE_DECL_SYS_SIGLIST (because the old + form has been removed), and +- The removal of trailing comments in src/config.h. + 1.320 +1 -1 XEmacs/xemacs/man/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.319 retrieving revision 1.320 diff -u -p -r1.319 -r1.320 --- ChangeLog 2005/10/26 15:14:05 1.319 +++ ChangeLog 2005/11/07 08:49:23 1.320 ＠＠ -163,7 +163,7 ＠＠ for evaluation in Lisp interaction mode, and should be documented as such. -2005-04-18 Turnbull Stephen <stephen(a)xemacs.org&gt; +2005-04-18 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * internals/internals.texi (Better Rendering Support -- Modern Font Support): 1.38 +4 -3 XEmacs/xemacs/netinstall/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- ChangeLog 2005/10/26 15:14:20 1.37 +++ ChangeLog 2005/11/07 08:49:24 1.38 ＠＠ -1,3 +1,7 ＠＠ +2005-11-06 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * ChangeLog: Nuke useless CVS keyword. + 2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.23 "daikon" is released. ＠＠ -523,7 +527,4 ＠＠ 2000-11-12 Andy Piper <andy(a)xemacs.org&gt; * all: port from cygwin setup. - -%%% $Id: ChangeLog,v 1.37 2005/10/26 15:14:20 stephent Exp $ -$Revision: 1.37 $ 1.21 +13 -2 XEmacs/xemacs/src/inline.c Index: inline.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/inline.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- inline.c 2003/03/09 02:27:44 1.20 +++ inline.c 2005/11/07 08:49:25 1.21 ＠＠ -67,11 +67,22 ＠＠ Boston, MA 02111-1307, USA. */ #include "syntax.h" #include "window.h" -#if defined (HAVE_LDAP) && !defined (HAVE_SHLIB) +/* If we demand !defined (HAVE_SHLIB) the INLINE_HEADERS aren't instantiated. + This only shows up in --with-error-checking=types builds AFAIK. + On Mac OS X 10.3.9 with the Apple toolchain (GCC 3.3) gives a buildtime + link error (the lrecord error_check functions are undefined). + Debian GNU/Linux `sid' with GCC 4.0.3 prerelease & binutils 2.16.91 gives + a runtime link error (the lrecord error_check functions are undefined). + It is possible that this can be fixed trickily by appropriately defining + INLINE, or that it should be done in the module itself somehow. If you + can do it better or more elegantly, please feel free to consult me. + --stephen 2005-11-07 */ +#if defined (HAVE_LDAP) #include "../modules/ldap/eldap.h" #endif -#if defined (HAVE_POSTGRESQL) && !defined (HAVE_SHLIB) +/* We can't ask for !defined (HAVE_SHLIB). See HAVE_LDAP, above. */ +#if defined (HAVE_POSTGRESQL) #include "../modules/postgresql/postgresql.h" #endif 1.882 +4 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.881 retrieving revision 1.882 diff -u -p -r1.881 -r1.882 --- ChangeLog 2005/11/02 10:01:57 1.881 +++ ChangeLog 2005/11/07 08:49:25 1.882 ＠＠ -1,3 +1,7 ＠＠ +2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * inline.c: Include modules headers regardless of HAVE_SHLIB. + 2005-11-02 Marcus Crestani <crestani(a)xemacs.org&gt; * realpath.c (readlink_or_correct_case): Move the closing paren