--- v4l-utils-1.0.1/contrib/test/Makefile.am.orig	2015-01-30 10:09:30.654947908 -0500
+++ v4l-utils-1.0.1/contrib/test/Makefile.am	2015-01-30 10:10:25.485949534 -0500
@@ -25,10 +25,11 @@ pixfmt_test_CFLAGS = $(X11_CFLAGS)
 pixfmt_test_LDFLAGS = $(X11_LIBS)
 
 v4l2grab_SOURCES = v4l2grab.c
+v4l2grab_LDFLAGS = $(ARGP_LIBS)
 v4l2grab_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
 
 v4l2gl_SOURCES = v4l2gl.c
-v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS)
+v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS)
 v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
 
 ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h
--- v4l-utils-1.0.1/contrib/test/Makefile.in.orig	2014-01-13 15:11:14.000000000 -0500
+++ v4l-utils-1.0.1/contrib/test/Makefile.in	2015-01-30 10:14:32.836956872 -0500
@@ -141,6 +141,9 @@ am_v4l2grab_OBJECTS = v4l2grab.$(OBJEXT)
 v4l2grab_OBJECTS = $(am_v4l2grab_OBJECTS)
 v4l2grab_DEPENDENCIES = ../../lib/libv4l2/libv4l2.la \
 	../../lib/libv4lconvert/libv4lconvert.la
+v4l2grab_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(v4l2grab_LDFLAGS) $(LDFLAGS) -o $@
 am_v4lgrab_OBJECTS = v4lgrab.$(OBJEXT)
 v4lgrab_OBJECTS = $(am_v4lgrab_OBJECTS)
 v4lgrab_LDADD = $(LDADD)
@@ -381,9 +384,10 @@ pixfmt_test_SOURCES = pixfmt-test.c
 pixfmt_test_CFLAGS = $(X11_CFLAGS)
 pixfmt_test_LDFLAGS = $(X11_LIBS)
 v4l2grab_SOURCES = v4l2grab.c
+v4l2grab_LDFLAGS = $(ARGP_LIBS)
 v4l2grab_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
 v4l2gl_SOURCES = v4l2gl.c
-v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS)
+v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS)
 v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
 ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h
 sliced_vbi_test_SOURCES = sliced-vbi-test.c
@@ -473,7 +477,7 @@ v4l2gl$(EXEEXT): $(v4l2gl_OBJECTS) $(v4l
 
 v4l2grab$(EXEEXT): $(v4l2grab_OBJECTS) $(v4l2grab_DEPENDENCIES) $(EXTRA_v4l2grab_DEPENDENCIES) 
 	@rm -f v4l2grab$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(v4l2grab_OBJECTS) $(v4l2grab_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(v4l2grab_LINK) $(v4l2grab_OBJECTS) $(v4l2grab_LDADD) $(LIBS)
 
 v4lgrab$(EXEEXT): $(v4lgrab_OBJECTS) $(v4lgrab_DEPENDENCIES) $(EXTRA_v4lgrab_DEPENDENCIES) 
 	@rm -f v4lgrab$(EXEEXT)