commit/XEmacs: Jerry James: Fix the module build by completing removal of need_modules_common, forgotten
11 years, 9 months
Bitbucket
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/1af0602ff9a2/
changeset: 1af0602ff9a2
user: Jerry James
date: 2013-03-04 18:24:55
summary: Fix the module build by completing removal of need_modules_common, forgotten
in the previous patch. See xemacs-patches message
<CAHCOHQmVdDxM1u_z3cMdj0tOsfVSTQ3BTZ4K_kxsDsz9V9qReQ(a)mail.gmail.com>.
affected #: 3 files
diff -r ede80ef92a7400023322cc8014b788c157b5ef91 -r 1af0602ff9a2db7f6ca40be0e869dde2e6daee9a ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,8 ＠＠
+2013-03-04 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Complete removal of need_modules_common, forgotten
+ in the previous patch.
+
2013-03-02 Jerry James <james(a)xemacs.org>
* configure.ac: Make symbolic links in src for module source files
diff -r ede80ef92a7400023322cc8014b788c157b5ef91 -r 1af0602ff9a2db7f6ca40be0e869dde2e6daee9a configure
--- a/configure
+++ b/configure
＠＠ -20737,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 ede80ef92a7400023322cc8014b788c157b5ef91 -r 1af0602ff9a2db7f6ca40be0e869dde2e6daee9a configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -5369,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"
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/XEmacs: Jerry James: Make soft links in src for module source files, if built in to the executable.
11 years, 9 months
Bitbucket
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/ede80ef92a74/
changeset: ede80ef92a74
user: Jerry James
date: 2013-03-02 22:32:37
summary: Make soft links in src for module source files, if built in to the executable.
This ensures that those files are built with the same compiler flags as all
other source files.
See these xemacs-beta messages:
<CAHCOHQn+q=Xuwq+y68dvqi7afAP9f-TdB7=8YiZ8VYO816sjHg＠mail.gmail.com><f5by5ejqiyk.fsf(a)calexico.inf.ed.ac.uk>
affected #: 5 files
diff -r fffa151380192308e890528ce556f70a19da6e93 -r ede80ef92a7400023322cc8014b788c157b5ef91 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,9 ＠＠
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * 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 <stephen(a)xemacs.org>
* XEmacs 21.5.33 "horseradish" is released.
diff -r fffa151380192308e890528ce556f70a19da6e93 -r ede80ef92a7400023322cc8014b788c157b5ef91 configure
--- a/configure
+++ b/configure
＠＠ -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
diff -r fffa151380192308e890528ce556f70a19da6e93 -r ede80ef92a7400023322cc8014b788c157b5ef91 configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -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
diff -r fffa151380192308e890528ce556f70a19da6e93 -r ede80ef92a7400023322cc8014b788c157b5ef91 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
＠＠ -1,3 +1,9 ＠＠
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * 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 <mike(a)xemacs.org>
* event-stream.c (post_command_hook): Don't complain about throws
diff -r fffa151380192308e890528ce556f70a19da6e93 -r ede80ef92a7400023322cc8014b788c157b5ef91 src/Makefile.in.in
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
＠＠ -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
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC 21.5] Soft links for module source files
11 years, 9 months
Jerry James
Jerry James
APPROVE COMMIT 21.5
On Wed, Feb 20, 2013 at 5:16 AM, Henry S. Thompson <ht(a)inf.ed.ac.uk> wrote:
> Works for me with up-to-date pull -- thanks!
On the strength of that endorsement, I am committing the following
patch. It makes soft links in src for module source files, if those
files are to be built into the executable (rather than built as
standalone modules). This ensures that they are built with the same
compiler flags as the other source files.
diff -r fffa15138019 ChangeLog
--- a/ChangeLog Fri Feb 22 16:18:37 2013 +0100
+++ b/ChangeLog Sat Mar 02 14:27:06 2013 -0700
＠＠ -1,3 +1,9 ＠＠
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * 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 <stephen(a)xemacs.org>
* XEmacs 21.5.33 "horseradish" is released.
diff -r fffa15138019 configure
--- a/configure Fri Feb 22 16:18:37 2013 +0100
+++ b/configure Sat Mar 02 14:27:06 2013 -0700
＠＠ -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
diff -r fffa15138019 configure.ac
--- a/configure.ac Fri Feb 22 16:18:37 2013 +0100
+++ b/configure.ac Sat Mar 02 14:27:06 2013 -0700
＠＠ -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
diff -r fffa15138019 src/ChangeLog
--- a/src/ChangeLog Fri Feb 22 16:18:37 2013 +0100
+++ b/src/ChangeLog Sat Mar 02 14:27:06 2013 -0700
＠＠ -1,3 +1,9 ＠＠
+2013-03-02 Jerry James <james(a)xemacs.org>
+
+ * 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 <mike(a)xemacs.org>
* event-stream.c (post_command_hook): Don't complain about throws
diff -r fffa15138019 src/Makefile.in.in
--- a/src/Makefile.in.in Fri Feb 22 16:18:37 2013 +0100
+++ b/src/Makefile.in.in Sat Mar 02 14:27:06 2013 -0700
＠＠ -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
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments