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

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

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

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

1124N/A

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

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

1124N/A---

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

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

1124N/A

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

1276N/Aindex 50ebdb6..1f9786e 100644

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

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

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

1124N/A AC_CONFIG_AUX_DIR([.])

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

1124N/A

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

1124N/A-

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

1124N/A

1124N/A dnl Checks for programs.

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

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

1124N/A

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

1124N/A-AC_CONFIG_SUBDIRS([zlib])

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

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

1124N/A+fi

1124N/A

1124N/A dnl Check for libjpeg library

1124N/A INCLUDED_JPEG=yes

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

1124N/A [])

1124N/A

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

1124N/A-AC_CONFIG_SUBDIRS([jpeg])

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

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

1124N/A+fi

1124N/A

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

1124N/A