123N/AFrom 9281c763b3617e5a126012ae15f77ab2102448e4 Mon Sep 17 00:00:00 2001

123N/AFrom: Alan Coopersmith <alan.coopersmith@sun.com>

123N/ADate: Fri, 30 Oct 2009 16:49:10 -0700

123N/ASubject: [PATCH 1/2] Don't run configure for unused subdirs

123N/A

123N/APrevents configure from failing if nasm can't be found when it's

123N/Anot needed because --with-system-jpeg was passed

123N/A---

123N/A configure.ac | 10 ++++++----

123N/A 1 files changed, 6 insertions(+), 4 deletions(-)

123N/A

123N/Adiff --git a/configure.ac b/configure.ac

123N/Aindex 50ebdb6..1f9786e 100644

123N/A--- a/configure.ac

123N/A+++ b/configure.ac

123N/A@@ -10,8 +10,6 @@ BUILD=`date +%Y%m%d`

123N/A AC_CONFIG_AUX_DIR([.])

123N/A AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])

123N/A

123N/A-AC_CONFIG_SUBDIRS([common/jpeg common/zlib])

123N/A-

123N/A AC_CONFIG_HEADERS([config.h])

123N/A

123N/A dnl Checks for programs.

123N/A@@ -192,7 +190,9 @@ AC_ARG_WITH([included-zlib],

123N/A [AC_SEARCH_LIBS([inflateEnd], [z], [], [INCLUDED_ZLIB=yes])])

123N/A

123N/A AM_CONDITIONAL([INCLUDED_ZLIB], [ test "x$INCLUDED_ZLIB" = xyes ])

123N/A-AC_CONFIG_SUBDIRS([zlib])

123N/A+if test "x$INCLUDED_ZLIB" = xyes ; then

123N/A+ AC_CONFIG_SUBDIRS([common/zlib])

123N/A+fi

169N/A

123N/A dnl Check for libjpeg library

123N/A INCLUDED_JPEG=yes

123N/A@@ -204,7 +204,9 @@ AC_ARG_WITH([system-jpeg],

123N/A [])

123N/A

123N/A AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ])

169N/A-AC_CONFIG_SUBDIRS([jpeg])

123N/A+if test "x$INCLUDED_JPEG" = xyes ; then

123N/A+ AC_CONFIG_SUBDIRS([common/jpeg])

123N/A+fi

123N/A

123N/A AC_CHECK_FUNCS([vsnprintf snprintf strcasecmp strncasecmp])

123N/A

123N/A