* Merge libjpeg and libjpeg-static.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15275

pkgs/development/libraries/libjpeg/builder.sh

@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-configureFlags="--enable-shared"
-
 preConfigure=preConfigure
 preConfigure() {
     # Workarounds for the ancient libtool shipped by libjpeg.

pkgs/development/libraries/libjpeg/default.nix

@@ -1,14 +1,19 @@
-{stdenv, fetchurl, libtool}: 
+{stdenv, fetchurl, libtool, static ? false}: 
 
 stdenv.mkDerivation {
   name = "libjpeg-6b";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
+  
   inherit libtool;
 
+  configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
+    
   # Required for building of dynamic libraries on Darwin.
   patches = [
     (fetchurl {