add --enable-all-static option for static frontend linking

Note that I also replaced AC_PROG_RANLIB with LT_INIT in configure.ac
and added an m4 subdir to hold the output of libtoolize.

Author: kwantam

.gitignore

@@ -10,14 +10,19 @@ Makefile.in
 /aclocal.m4
 /ar-lib
 /autom4te.cache
+/compile
+/config.guess
 /config.h
 /config.h.in
 /config.h.in~
 /config.log
 /config.status
+/config.sub
 /configure
 /depcomp
 /install-sh
+/libtool
+/ltmain.sh
 /missing
 /alfalfa-*.tar.gz
 /stamp-h1

Makefile.am

@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug
 
 SUBDIRS = src man

configure.ac

@@ -6,10 +6,12 @@ AC_INIT([alfalfa], [0.1], [[email protected]])
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AC_CONFIG_SRCDIR([src/decoder/prediction.cc])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 # Checks for programs.
 AC_PROG_CXX
-AC_PROG_RANLIB
+dnl AC_PROG_RANLIB
+LT_INIT
 AC_PATH_PROG([PERL], [perl], [])
 AS_IF([test x"$PERL" = x],
   [AC_MSG_ERROR([cannot find perl])])
@@ -42,6 +44,20 @@ AC_ARG_ENABLE([debug],
 
 AC_SUBST(NODEBUG_CXXFLAGS)
 
+AC_ARG_ENABLE([all-static],
+  [AS_HELP_STRING([--enable-all-static], [Build statically linked binaries])],
+  [case "$enableval" in
+    '' | yes)
+        STATIC_BUILD_FLAG="-all-static"
+        ;;
+    *)
+        AC_MSG_ERROR([Unknown argument '$enableval' to --enable-all-static])
+        ;;
+   esac],
+  [STATIC_BUILD_FLAG=""])
+
+AC_SUBST(STATIC_BUILD_FLAG)
+
 # Checks for assemblers
 # TODO only check this when arch is x86
 AC_CHECK_PROGS([AS], [yasm nasm], [none])

m4/.gitignore

@@ -0,0 +1 @@
+*

src/frontend/Makefile.am

@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../decoder -I$(srcdir)/../display -I$(srcdir)/../encoder $(GLU_CFLAGS) $(GLEW_CFLAGS) $(GLFW3_CFLAGS) $(X264_CFLAGS) $(CXX11_FLAGS)
 AM_CXXFLAGS = $(PICKY_CXXFLAGS) $(NODEBUG_CXXFLAGS)
+AM_LDFLAGS = $(STATIC_BUILD_FLAG)
 
 bin_PROGRAMS = vp8decode vp8play collisions xc-enc xc-ssim xc-dissect xc-framesize xc-stitch comp-states
 
@@ -8,6 +9,9 @@ vp8decode_LDADD = ../decoder/libalfalfadecoder.a ../util/libalfalfautil.a $(X264
 
 vp8play_SOURCES = vp8play.cc
 vp8play_LDADD = ../decoder/libalfalfadecoder.a ../encoder/libalfalfaencoder.a ../display/libalfalfadisplay.a ../util/libalfalfautil.a $(GLU_LIBS) $(X264_LIBS) $(GLEW_LIBS) $(GLFW3_LIBS)
+# NOTE: Debian does not distribute static libs for libGLEW et al,
+# so we have to override AM_LDFLAGS and always dynamically link
+vp8play_LDFLAGS =
 
 collisions_SOURCES = collisions.cc
 collisions_LDADD = ../decoder/libalfalfadecoder.a ../util/libalfalfautil.a $(X264_LIBS)