# HG changeset patch # User Mike Sperber # Date 1362470156 -3600 # Node ID 179f4a9201b5e056371ea83f50879a2384d69157 # Parent b3a2bff825c840944f997050fb558cb2d8ed8a43# Parent 1af0602ff9a2db7f6ca40be0e869dde2e6daee9a Merge. diff -r b3a2bff825c8 -r 179f4a9201b5 ChangeLog --- a/ChangeLog Sat Mar 02 18:00:42 2013 +0100 +++ b/ChangeLog Tue Mar 05 08:55:56 2013 +0100 @@ -1,3 +1,14 @@ +2013-03-04 Jerry James + + * configure.ac: Complete removal of need_modules_common, forgotten + in the previous patch. + +2013-03-02 Jerry James + + * configure.ac: Make symbolic links in src for module source files + if they are built into the executable, so they are built with the + same CFLAGS as the non-module source files. + 2013-01-04 Stephen J. Turnbull * XEmacs 21.5.33 "horseradish" is released. diff -r b3a2bff825c8 -r 179f4a9201b5 configure --- a/configure Sat Mar 02 18:00:42 2013 +0100 +++ b/configure Tue Mar 05 08:55:56 2013 +0100 @@ -15216,10 +15216,14 @@ done LIBS="$save_LIBS" - MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi - need_modules_common=yes if test "$with_modules" = "yes"; then + MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi + else + mkdir src + for fil in eldap.c eldap.h; do + ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil" + done fi fi @@ -15388,10 +15392,14 @@ _ACEOF 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 "$with_modules" = "yes"; then + MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi + else + mkdir src + for fil in postgresql.c postgresql.h; do + ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil" + done fi elif test "$with_postgresql" = "yes"; then { echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; } @@ -17431,10 +17439,12 @@ test -n "$canna_wchar_aware" && $as_echo "#define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h - MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi - need_modules_common=yes if test "$with_modules" = "yes"; then + MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi + else + mkdir src + ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c" fi canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi elif test "$with_canna" != "no"; then @@ -20727,7 +20737,7 @@ fi done -if test "$need_modules_common" = "yes"; then +if test "$with_modules" = "yes"; then for dir in modules/common; do if test ! -d "$dir" ; then echo Making symbolic link to "$srcdir/$dir" diff -r b3a2bff825c8 -r 179f4a9201b5 configure.ac --- a/configure.ac Sat Mar 02 18:00:42 2013 +0100 +++ b/configure.ac Tue Mar 05 08:55:56 2013 +0100 @@ -3613,10 +3613,14 @@ save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs" AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) LIBS="$save_LIBS" - XE_APPEND(modules/ldap, MAKE_SUBDIR) - need_modules_common=yes if test "$with_modules" = "yes"; then + XE_APPEND(modules/ldap, MAKE_SUBDIR) XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR) + else + mkdir src + for fil in eldap.c eldap.h; do + ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil" + done fi fi AC_SUBST(ldap_libs) @@ -3664,10 +3668,14 @@ AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs) AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file") XE_PREPEND([$pq_libs], postgresql_libs) - XE_APPEND(modules/postgresql, MAKE_SUBDIR) - need_modules_common=yes if test "$with_modules" = "yes"; then + XE_APPEND(modules/postgresql, MAKE_SUBDIR) XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR) + else + mkdir src + for fil in postgresql.c postgresql.h; do + ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil" + done fi elif test "$with_postgresql" = "yes"; then XE_DIE("Required PostgreSQL support cannot be provided. Check --with-site-prefixes.") @@ -4340,10 +4348,12 @@ if test "$have_canna" = "yes"; then AC_DEFINE(HAVE_CANNA) test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE) - XE_APPEND(modules/canna, MAKE_SUBDIR) - need_modules_common=yes if test "$with_modules" = "yes"; then + XE_APPEND(modules/canna, MAKE_SUBDIR) XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR) + else + mkdir src + ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c" fi XE_PREPEND(-lcanna -lRKC, canna_libs) elif test "$with_canna" != "no"; then @@ -5359,7 +5369,7 @@ done dnl Also make modules/common link if needed for the module Makefiles. -if test "$need_modules_common" = "yes"; then +if test "$with_modules" = "yes"; then for dir in modules/common; do if test ! -d "$dir" ; then echo Making symbolic link to "$srcdir/$dir" diff -r b3a2bff825c8 -r 179f4a9201b5 src/ChangeLog --- a/src/ChangeLog Sat Mar 02 18:00:42 2013 +0100 +++ b/src/ChangeLog Tue Mar 05 08:55:56 2013 +0100 @@ -1,3 +1,9 @@ +2013-03-02 Jerry James + + * Makefile.in.in: If modules are built into the executable, assume + that module source files are available in the current directory, + since configure now creates soft links for them. + 2013-02-22 Michael Sperber * event-stream.c (post_command_hook): Don't complain about throws diff -r b3a2bff825c8 -r 179f4a9201b5 src/Makefile.in.in --- a/src/Makefile.in.in Sat Mar 02 18:00:42 2013 +0100 +++ b/src/Makefile.in.in Tue Mar 05 08:55:56 2013 +0100 @@ -192,7 +192,7 @@ #endif #if defined(HAVE_LDAP) && !defined(HAVE_SHLIB) -ldap_objs=$(BLDMODULES)/ldap/eldap.o +ldap_objs=eldap.o #endif #ifdef MULE @@ -200,7 +200,7 @@ #endif #if defined(HAVE_CANNA) && !defined(HAVE_SHLIB) -mule_canna_objs=$(BLDMODULES)/canna/canna_api.o +mule_canna_objs=canna_api.o #endif #ifdef HAVE_WNN @@ -215,7 +215,7 @@ #endif #if defined(HAVE_POSTGRESQL) && !defined(HAVE_SHLIB) -postgresql_objs=$(BLDMODULES)/postgresql/postgresql.o +postgresql_objs=postgresql.o #endif #ifdef HAVE_WIN32_PROCESSES