@@ -14,7 +14,12 @@ # with zshdb; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -SUBDIRS = command emacs lib test +subdirs = command lib test +if INSTALL_EMACS_LISP +SUBDIRS = $(subdirs) emacs +else +SUBDIRS = $(subdirs) +endif pkgdata_DATA = \ dbg-pre.sh \ Makefile.am @@ -98,7 +98,8 @@ else fi fi -AM_CONDITIONAL(INSTALL_EMACS_LISP, test "x$lispdir" != "x") +AM_CONDITIONAL(INSTALL_EMACS_LISP, + [test "x$lispdir" != "x" -a "x$EMACS" != "xno"]) AC_CONFIG_FILES([ \ Makefile \ configure.ac @@ -44,7 +44,7 @@ typeset _Dbg_libdir=@PKGDATADIR@ [[ ! -d $_Dbg_libdir ]] && _Dbg_libdir='.' # Parse just the libdir option -local -a libdir +typeset -a libdir zparseopts -a libdir -E L: -library: if (( ${#libdir} > 0 )) ; then typeset -a lib_opts; eval "lib_opts=($libdir)" dbg-trace.sh.in @@ -30,7 +30,6 @@ function _Dbg_debug_trap_handler { # Turn off line and variable trace listing. set +x +v +u +e - print ${funcfiletrace[@]} _Dbg_set_debugger_entry 'create_unsetopt' # If some options are set (like localtraps?) then lib/hook.sh e419663307402624f6434d786de0b089051b9dbc R. Bernstein rocky@gnu.org http://github.com/rocky/zshdb/commit/bc40b59a56739fe2f60edbc38bba2aba4eed3c0d bc40b59a56739fe2f60edbc38bba2aba4eed3c0d 2008-09-26T11:25:48-07:00 2008-09-26T11:25:48-07:00 Don't run Emacs testing if no Emacs (Clint Adams). Remove stray debugging print. 262ac9c18317cde6da69f07771b5519092288b60 R. Bernstein rocky@gnu.org