98N/AFrom 9281c763b3617e5a126012ae15f77ab2102448e4 Mon Sep 17 00:00:00 2001
98N/AFrom: Alan Coopersmith <alan.coopersmith@sun.com>
109N/ADate: Fri, 30 Oct 2009 16:49:10 -0700
98N/ASubject: [PATCH 1/2] Don't run configure for unused subdirs
98N/APrevents configure from failing if nasm can't be found when it's
98N/Anot needed because --with-system-jpeg was passed
98N/A 1 files changed, 6 insertions(+), 4 deletions(-)
98N/Aindex 5acd762..66b9b34 100644
98N/A@@ -5,8 +5,6 @@ BUILD=`date +%Y%m%d`
98N/A AC_CONFIG_AUX_DIR([.])
98N/A AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
98N/A dnl Checks for programs.
98N/A@@ -136,7 +134,9 @@ AC_ARG_WITH([included-zlib],
98N/A [AC_SEARCH_LIBS([inflateEnd], [z], [], [INCLUDED_ZLIB=yes])])
98N/A AM_CONDITIONAL([INCLUDED_ZLIB], [ test "x$INCLUDED_ZLIB" = xyes ])
98N/A-AC_CONFIG_SUBDIRS([zlib])
98N/A+if test "x$INCLUDED_ZLIB" = xyes ; then
98N/A dnl Check for libjpeg library
98N/A@@ -148,7 +148,9 @@ AC_ARG_WITH([system-jpeg],
98N/A AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ])
493N/A-AC_CONFIG_SUBDIRS([jpeg])
98N/A+if test "x$INCLUDED_JPEG" = xyes ; then
98N/A AC_CHECK_FUNCS([vsnprintf snprintf strcasecmp strncasecmp])