diff -cr dash_np/configure.ac dash_mp/configure.ac
*** dash_np/configure.ac	Sat Sep  3 01:06:25 2011
--- dash_mp/configure.ac	Sat Sep  3 01:45:59 2011
***************
*** 129,135 ****
  if test "$use_libedit" != "yes"; then
  	AC_DEFINE([SMALL], 1, [Define if you build with -DSMALL])
  else
! 	export LIBS="$LIBS -ledit"
  fi
  AC_ARG_ENABLE(lineno, AS_HELP_STRING(--disable-lineno, \
  				     [Disable LINENO support]))
--- 129,139 ----
  if test "$use_libedit" != "yes"; then
  	AC_DEFINE([SMALL], 1, [Define if you build with -DSMALL])
  else
! 	if test "$enable_static" = "yes"; then
! 		PKG_CHECK_MODULES([LIBEDIT], [libedit >= 0])
! 	else
! 		export LIBS="$LIBS -ledit"
! 	fi
  fi
  AC_ARG_ENABLE(lineno, AS_HELP_STRING(--disable-lineno, \
  				     [Disable LINENO support]))
diff -cr dash_np/src/Makefile.am dash_mp/src/Makefile.am
*** dash_np/src/Makefile.am	Sat Sep  3 01:06:25 2011
--- dash_mp/src/Makefile.am	Sat Sep  3 01:47:39 2011
***************
*** 6,12 ****
  	-DBSD=1 -DSHELL \
  	-DIFS_BROKEN
  
! AM_CFLAGS = $(COMMON_CFLAGS)
  AM_CPPFLAGS = $(COMMON_CPPFLAGS)
  AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) 
  AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS)
--- 6,12 ----
  	-DBSD=1 -DSHELL \
  	-DIFS_BROKEN
  
! AM_CFLAGS = $(COMMON_CFLAGS) $(LIBEDIT_CFLAGS)
  AM_CPPFLAGS = $(COMMON_CPPFLAGS)
  AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) 
  AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS)
***************
*** 30,36 ****
  	init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \
  	myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \
  	show.h system.h trap.h var.h
! dash_LDADD = builtins.o init.o nodes.o signames.o syntax.o
  
  HELPERS = mkinit mksyntax mknodes mksignames
  
--- 30,36 ----
  	init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \
  	myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \
  	show.h system.h trap.h var.h
! dash_LDADD = builtins.o init.o nodes.o signames.o syntax.o $(LIBEDIT_LIBS)
  
  HELPERS = mkinit mksyntax mknodes mksignames