changeset 23117:1f11bc1afc2f

Merge config.h variable declarations into libpostproc test.
author diego
date Thu, 26 Apr 2007 13:01:54 +0000
parents 7008af009c45
children d23870bed7ee
files configure
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Apr 26 12:59:57 2007 +0000
+++ b/configure	Thu Apr 26 13:01:54 2007 +0000
@@ -6290,18 +6290,14 @@
   fi
 fi
 _libpostproc=no
-test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes
-echores "$_libpostproc"
-
 _def_libpostproc='#undef USE_LIBPOSTPROC'
 _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
-if test "$_libpostproc_a" = yes ; then
-  _def_libpostproc='#define USE_LIBPOSTPROC 1'
-else
-  if test "$_libpostproc_so" = yes ; then
-    _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'
-  fi
-fi
+test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes
+test "$_libpostproc_a"  = yes && _def_libpostproc='#define USE_LIBPOSTPROC 1'
+test "$_libpostproc_so" = yes \
+  && _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'
+echores "$_libpostproc"
+
 
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then