Merge branch 'master' of gitea.nerdland.org:adam/flenser into master

* 'master' of gitea.nerdland.org:adam/flenser:
  Automatic processor count for parallel make
  Fix building when webp libs are not there.

rebuild

@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
+processor_count=`grep -c "^processor" /proc/cpuinfo`
+count=$((${processor_count} - 1))
+echo "Detected ${processor_count} processors, using ${count}"
+
 make distclean
 pushd ..
 ./autogen.sh
 popd
+
 ../configure --prefix=/opt/local --enable-ipv6 CXXFLAGS="-O0 -g"
-make -kj11
+make -kj${count}

src/webp.cc

@@ -218,8 +218,8 @@ void *a_Webp_new(DilloImage *Image, DilloUrl *url, int version)
 
 #else /* ENABLE_WEBP */
 
-void *a_Webp_new() { return 0; }
-void a_Webp_callback() { return; }
+void *a_Webp_new(DilloImage *, DilloUrl *, int) { return 0; }
+void a_Webp_callback(int Op, void *data) { return; }
 const char *a_Webp_version(char *buf, int n) { return 0; }
 
 #endif /* ENABLE_WEBP */