Merged from emacs@sv.gnu.org

[bpt/emacs.git] / configure

diff --git a/configure b/configure
index 2477f10..46d171e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1354,8 +1354,8 @@ rm conftest.sed
 
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim'
-lisppath='${locallisppath}:${lispdir}'
+'${datadir}/emacs/site-lisp'
+lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
 etcdir='${datadir}/emacs/${version}/etc'
 archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'
@@ -5675,7 +5675,7 @@ fi
         echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5
 echo $ECHO_N "checking for $ALSA_MODULES... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "$ALSA_MODULES" ; then
+        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
@@ -10319,7 +10319,7 @@ echo "$as_me: error:
         echo "$as_me:$LINENO: checking for $GTK_MODULES" >&5
 echo $ECHO_N "checking for $GTK_MODULES... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "$GTK_MODULES" ; then
+        if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes