git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@82 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/configure b/configure
index cf2ccf7..754c5b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -6715,27 +6715,27 @@ echo $ECHO_N "checking for S-Lang... $ECHO_C" >&6
         if test $withval = yes; then
                 if test -d $srcdir/../slang; then
                         mutt_cv_slang=$srcdir/../slang/src
-                        CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
+                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
                         LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
                 else
                         if test -d $mutt_cv_prefix/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
+                                CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang"
                         elif test -d /usr/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I/usr/include/slang"
+                                CFLAGS="$CFLAGS -I/usr/include/slang"
                         fi
                         mutt_cv_slang=yes
                 fi
         else
                                 if test -f $withval/src/slang.h; then
                         mutt_cv_slang=$withval/src
-                        CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
+                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
                         LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
                 else
                                                 mutt_cv_slang=$withval
                         if test -d $withval/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
+                                CFLAGS="$CFLAGS -I${withval}/include/slang"
                         elif test -d $withval/include; then
-                                CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                                CFLAGS="$CFLAGS -I${withval}/include"
                         fi
                         LDFLAGS="$LDFLAGS -L${withval}/lib"
                 fi

diff --git a/imap/Makefile.in b/imap/Makefile.in
index 264abed..e26d275 100644 (file)
--- a/imap/Makefile.in
+++ b/imap/Makefile.in
@@ -178,9 +178,9 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 
 @USE_GSS_TRUE@GSSSOURCES = auth_gss.c
+@USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c
 
 @USE_SASL_TRUE@AUTHENTICATORS = auth_sasl.c
-@USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c
 
 EXTRA_DIST = BUGS README TODO auth_anon.c auth_cram.c auth_gss.c auth_sasl.c
 
@@ -202,8 +202,8 @@ LIBRARIES = $(noinst_LIBRARIES)
 libimap_a_AR = $(AR) cru
 libimap_a_LIBADD =
 am__libimap_a_SOURCES_DIST = auth.c auth_login.c browse.c command.c \
-       imap.c imap.h message.c utf7.c util.c auth_sasl.c auth_anon.c \
-       auth_cram.c auth_gss.c
+       imap.c imap.h message.c utf7.c util.c auth_anon.c auth_cram.c \
+       auth_sasl.c auth_gss.c
 @USE_SASL_TRUE@am__objects_1 = auth_sasl.$(OBJEXT)
 @USE_SASL_FALSE@am__objects_1 = auth_anon.$(OBJEXT) auth_cram.$(OBJEXT)
 @USE_GSS_TRUE@am__objects_2 = auth_gss.$(OBJEXT)