jaromail

commit 170dffe33bff55ed3d6156f895b75f1060bf6f86
parent 6e2735e86537bd55f5cc413959d6a7e041f68c17
Author: Jaromil <jaromil@dyne.org>
Date:   Tue,  4 Sep 2012 13:22:37 +0200

small mutt fixes

Diffstat:
M
build/build-gnu.sh
 | 
9
+++++----
M
build/cc-static.zsh
 | 
39
++++++++++++++++++++-------------------
M
src/mutt/colors
 | 
2
+-

3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/build/build-gnu.sh b/build/build-gnu.sh
@@ -37,7 +37,9 @@ case $distro in
 		which sqlite3 || sudo apt-get install sqlite3
 		[ -r /usr/share/doc/libgnome-keyring-dev/copyright ] || \
 		    sudo apt-get install libglib2.0-dev libgnome-keyring-dev
-		sudo apt-get install libtokyocabinet-dev
+		{ test -r /usr/lib/pkgconfig/tokyocabinet.pc } || {
+		    sudo apt-get install libtokyocabinet-dev }
+		which gpgme-config || sudo apt-get install libgpgme11-dev
 		echo "All dependencies installed"
 	}
 
@@ -103,9 +105,8 @@ case $distro in
 		echo "Compiling Mutt (MUA)"
 		pushd src/mutt-1.5.21
 		CC="$cc" ./configure \
-		    --with-ssl --with-gnutls --enable-imap --disable-debug --with-slang \
-		    --enable-hcache --with-regex --with-tokyocabinet --with-mixmaster \
-		    --with-mailpath=Mail --with-homespool=Mail/known --with-exec-shell=/usr/bin/zsh \
+		    --with-ssl --with-gnutls --enable-imap --disable-debug --with-slang --disable-gpgme \
+		    --enable-hcache --with-regex --with-tokyocabinet --with-mixmaster --enable-pgp \
 		    > /dev/null
 		make > make.log
 		popd
diff --git a/build/cc-static.zsh b/build/cc-static.zsh
@@ -58,6 +58,7 @@ esac
 arguments=($@)
 
 linkdep() {
+    # # descend lib dependencies
     dep="`basename ${1}`"
     { test "$dep" = "" } && { echo "Error: linkdep called with void argument"; return 1 }
 
@@ -135,24 +136,6 @@ echo $arguments | grep -i ' -l' > /dev/null
 	    lib=${i/-l/}
 
 	    linkdep "lib${lib}"
-
-	    # # descend lib dependencies
-
-	    # 	Darwin)
-
-	    # 	    deps1=`otool -L ${libdir}/$lib.dylib | awk '
-	    # 	    /^\// {next} /\/opt\/local/ {print $1}'`
-	    # 	    for d1 in ${(f)deps1}; do
-	    # 		dep=`basename $d1`
-	    # 		sdep=${dep/.*/.a}
-	    # 		ddep=${dep/lib/-l}
-	    # 		ddep=${ddep/.*/}
-	    # 		if [ -r ${libdir}/${sdep} ]; then
-	    # 		    arguments+=(${libdir}/${sdep})
-	    # 		else arguments+=($ddep); fi
-	    # 	    done
-	    # 	    ;;
-	    # esac
 	}
     done
     
@@ -166,7 +149,6 @@ echo $arguments | grep -i ' -l' > /dev/null
 	ds="`print ${d/lib/} | cut -d. -f1`"
 
 	{ test "$libraries[$ds]" = "static" } && { continue }
-	print "link lib${ds}"
 	linkdep "lib${ds}"
     done
 
@@ -180,3 +162,22 @@ typeset -U arguments
 # execute
 echo "$cc ${=cflags} ${=arguments}"
 $cc ${=cflags} ${=arguments}
+
+
+
+# TODO
+
+	    # 	Darwin)
+	    # 	    deps1=`otool -L ${libdir}/$lib.dylib | awk '
+	    # 	    /^\// {next} /\/opt\/local/ {print $1}'`
+	    # 	    for d1 in ${(f)deps1}; do
+	    # 		dep=`basename $d1`
+	    # 		sdep=${dep/.*/.a}
+	    # 		ddep=${dep/lib/-l}
+	    # 		ddep=${ddep/.*/}
+	    # 		if [ -r ${libdir}/${sdep} ]; then
+	    # 		    arguments+=(${libdir}/${sdep})
+	    # 		else arguments+=($ddep); fi
+	    # 	    done
+
+
diff --git a/src/mutt/colors b/src/mutt/colors
@@ -52,4 +52,4 @@ color index brightwhite black "~v" # Collapsed thread
 
 
 color index red black "~=" # Duplicated messages
-color index brightblack black "~D" # Deleted
+color index red black "~D" # Deleted