APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; # Date 1321867711 -3600 # Node ID bccc91a655362e5bd427e2179c942f2d99cf6ebc # Parent 79a1a759ec3dbfa7fe21eba9303d500b14f773b9 Fix .gdbinit and .dbxrc when using the new garbage collector; also fix creation of .dbxrc. ChangeLog: 2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; * configure.ac: Fix creation of etc/dbxrc and src/.dbxrc; only try to create Makefile when Makefile.in is there. * configure: Regenerate. src/ChangeLog: 2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; * .gdbinit.in.in: There is no lrecord_type_lcrecord_list when using the new garbage collector; print $lrecord_type when Lisp Object type is unknown to pobj. etc/ChangeLog: 2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; * dbxrc.in: There is no lrecord_type_lcrecord_list when using the new garbage collector; print $lrecord_type when Lisp Object type is unknown to pobj. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,9 ＠＠ +2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; + + * configure.ac: Fix creation of etc/dbxrc and src/.dbxrc; only try + to create Makefile when Makefile.in is there. + * configure: Regenerate. + 2011-10-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * configure.ac (with_athena): Refactor check for Xaw3d. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac ＠＠ -5377,8 +5377,8 ＠＠ dnl Create a .dbxrc useful for debugging XEmacs if test -f "$srcdir/etc/dbxrc.in"; then - test "$verbose" = "yes" && echo "creating src/.dbxrc.in" - echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in" + test "$verbose" = "yes" && echo "creating src/.dbxrc" + echo ". $srcdir/etc/dbxrc" > "$srcdir/src/.dbxrc" fi dnl Create a useful TAGS file ＠＠ -6009,6 +6009,9 ＠＠ mv -f Makefile.new $2 ])dnl CPP_MAKEFILE +dnl for creation of /etc/dbxrc +XE_APPEND(etc, MAKE_SUBDIR) + AC_CONFIG_COMMANDS([default], [for dir in . $MAKE_SUBDIR; do ( ＠＠ -6017,17 +6020,19 ＠＠ dnl Create a GNUmakefile and Makefile from Makefile.in. dnl Create xemacs.def from xemacs.def.in in the same fashion, dnl if it exists (i.e. in the src/ directory). Ditto for the -dnl debugger init files (in the src/ directory). +dnl debugger init files (in the src/ and etc/ directories). + if test -r "Makefile.in"; then MAKE_JUNK_C(Makefile.in) CPP_MAKEFILE(,Makefile) CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile) + fi if test -r ".gdbinit.in"; then MAKE_JUNK_C(.gdbinit.in) CPP_MAKEFILE(,.gdbinit) fi - if test -r ".dbxrc.in"; then - MAKE_JUNK_C(.dbxrc.in) - CPP_MAKEFILE(,.dbxrc) + if test -r "dbxrc.in"; then + MAKE_JUNK_C(dbxrc.in) + CPP_MAKEFILE(,dbxrc) fi if test -r "xemacs.def.in"; then dnl #### We should be using MAKE_JUNK_C instead of the next two lines. diff --git a/etc/ChangeLog b/etc/ChangeLog --- a/etc/ChangeLog +++ b/etc/ChangeLog ＠＠ -1,3 +1,9 ＠＠ +2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; + + * dbxrc.in: There is no lrecord_type_lcrecord_list when using the + new garbage collector; print $lrecord_type when Lisp Object type + is unknown to pobj. + 2011-06-28 Aidan Kehoe <kehoea(a)parhasard.net&gt; * HELLO: diff --git a/etc/dbxrc.in b/etc/dbxrc.in --- a/etc/dbxrc.in +++ b/etc/dbxrc.in ＠＠ -313,8 +313,10 ＠＠ pstruct glyphs.c Lisp_Image_Instance elif test $lrecord_type = lrecord_type_keymap; then pstruct keymap.c Lisp_Keymap +#ifndef NEW_GC elif test $lrecord_type = lrecord_type_lcrecord_list; then pstruct alloc.c lcrecord_list +#endif elif test $lrecord_type = lrecord_type_ldap; then pstruct ldap.c Lisp_LDAP elif test $lrecord_type = lrecord_type_lstream; then ＠＠ -361,6 +363,7 ＠＠ echo "Lisp Object is a null pointer!!" else echo "Unknown Lisp Object type" + print $lrecord_type print $1 fi } diff --git a/src/.gdbinit.in.in b/src/.gdbinit.in.in --- a/src/.gdbinit.in.in +++ b/src/.gdbinit.in.in ＠＠ -391,9 +391,11 ＠＠ if $lrecord_type == lrecord_type_keymap pptype Lisp_Keymap else +#ifndef NEW_GC if $lrecord_type == lrecord_type_lcrecord_list pstructtype lcrecord_list else +#endif if $lrecord_type == lrecord_type_ldap pptype Lisp_LDAP else ＠＠ -458,6 +460,7 ＠＠ pstructtype fc_config else echo Unknown Lisp Object type\n + print $lrecord_type print $arg0 ## Barf, gag, retch end ＠＠ -466,7 +469,9 ＠＠ end end end +#ifndef NEW_GC end +#endif end end end diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -1,3 +1,9 ＠＠ +2011-11-21 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de&gt; + + * .gdbinit.in.in: There is no lrecord_type_lcrecord_list when + using the new garbage collector; print $lrecord_type when Lisp + Object type is unknown to pobj. + 2011-11-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; * doc.c (Fbuilt_in_symbol_file): (Diff of configure ommitted for brevity.) -- Marcus _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches