GNOME.org
 

gimp r26699 - trunk

Author: mitch
Date: Thu Aug 21 15:56:32 2008
New Revision: 26699
URL: http://svn.gnome.org/viewvc/gimp?rev=26699&view=rev

Log:
2008-08-21  Michael Natterer  <mitch gimp org>

	* configure.in: removed indentation from blocks after
	AC_ARG_WITH(), it's confusing otherwise because they appeared to
	be part of the macro. Added some newlines. Minor cleanups.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug 21 15:56:32 2008
@@ -892,11 +892,13 @@
 #############################
 
 AC_ARG_ENABLE(mp, [  --disable-mp            disable support for multiple processors])
+
 if test "x$enable_mp" != "xno"; then
   AC_DEFINE(ENABLE_MP, 1,
 	    [Define to 1 to enable support for multiple processors.])
 fi
 
+
 ###################################################
 # gimp-remote is obsolete, but can still be enabled
 ###################################################
@@ -993,34 +995,35 @@
 # Check for libtiff
 ###################
 
-have_libtiff=no
 AC_ARG_WITH(libtiff,  [  --without-libtiff       build without TIFF support])
-  if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
-    have_libtiff=yes
-    AC_CHECK_LIB(tiff, TIFFReadScanline,
+
+have_libtiff=no
+if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
+  have_libtiff=yes
+  AC_CHECK_LIB(tiff, TIFFReadScanline,
+    [AC_CHECK_HEADER(tiffio.h,
+      FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff',
+      [have_libtiff="no (TIFF header files not found)"])],
+    [AC_CHECK_LIB(tiff, TIFFWriteScanline,
       [AC_CHECK_HEADER(tiffio.h,
-	FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff',
+        FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff -ljpeg -lz',
 	[have_libtiff="no (TIFF header files not found)"])],
-      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+      [AC_CHECK_LIB(tiff34, TIFFFlushData,
 	[AC_CHECK_HEADER(tiffio.h,
-          FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff -ljpeg -lz',
+          FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff34 -ljpeg -lz',
 	  [have_libtiff="no (TIFF header files not found)"])],
-	[AC_CHECK_LIB(tiff34, TIFFFlushData,
-	  [AC_CHECK_HEADER(tiffio.h,
-            FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff34 -ljpeg -lz',
-	    [have_libtiff="no (TIFF header files not found)"])],
-        [have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
-  fi
+      [have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+fi
 
-  if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
-    AC_MSG_ERROR([
+if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
+  AC_MSG_ERROR([
 *** Checks for TIFF libary failed. You can build without it by passing
 *** --without-libtiff to configure but you won't be able to use TIFFs then.])
-  fi
+fi
 
-  if test "x$have_libtiff" = xyes; then
-    MIME_TYPES="$MIME_TYPES;image/tiff"
-  fi
+if test "x$have_libtiff" = xyes; then
+  MIME_TYPES="$MIME_TYPES;image/tiff"
+fi
 
 AC_SUBST(FILE_TIFF_LOAD)
 AC_SUBST(FILE_TIFF_SAVE)
@@ -1031,45 +1034,45 @@
 # Check for libjpeg
 ###################
 
-jpeg_ok=no
-
 AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
-  if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-      jpeg_ok=yes,
-      [jpeg_ok="no (JPEG library not found)"
-      AC_MSG_WARN(*** XJT plug-in will not be built (JPEG library not found) ***)])
-    if test "$jpeg_ok" = yes; then
-      AC_MSG_CHECKING([for jpeglib.h])
-      AC_TRY_CPP([
+
+jpeg_ok=no
+if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
+  AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+    jpeg_ok=yes,
+    [jpeg_ok="no (JPEG library not found)"
+    AC_MSG_WARN(*** XJT plug-in will not be built (JPEG library not found) ***)])
+  if test "$jpeg_ok" = yes; then
+    AC_MSG_CHECKING([for jpeglib.h])
+    AC_TRY_CPP([
 #include <stdio.h>
 #undef HAVE_STDDEF_H
 #undef HAVE_STDLIB_H
 #undef PACKAGE
 #undef VERSION
 #include <jpeglib.h>],
-	jpeg_ok=yes,
-	jpeg_ok="no (Can't include jpeglib.h)")
-      AC_MSG_RESULT($jpeg_ok)
-      if test "$jpeg_ok" = yes; then
-	AC_CHECK_LIB(jpeg, jpeg_save_markers,
-	JPEG='jpeg$(EXEEXT)'; JPEG_LIBS='-ljpeg',
-        jpeg_ok="no (JPEG library is too old)")
-      else
-	jpeg_ok="no (JPEG header file not found)"
-      fi
+      jpeg_ok=yes,
+      jpeg_ok="no (Can't include jpeglib.h)")
+    AC_MSG_RESULT($jpeg_ok)
+    if test "$jpeg_ok" = yes; then
+      AC_CHECK_LIB(jpeg, jpeg_save_markers,
+      JPEG='jpeg$(EXEEXT)'; JPEG_LIBS='-ljpeg',
+      jpeg_ok="no (JPEG library is too old)")
+    else
+      jpeg_ok="no (JPEG header file not found)"
     fi
   fi
+fi
 
-  if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
-    AC_MSG_ERROR([
+if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
+  AC_MSG_ERROR([
 *** Checks for JPEG library failed. You can build without it by passing
 *** --without-libjpeg to configure but you won't be able to use JPEGs then.])
-  fi
+fi
 
-  if test "x$jpeg_ok" = xyes; then
-    MIME_TYPES="$MIME_TYPES;image/jpeg"
-  fi
+if test "x$jpeg_ok" = xyes; then
+  MIME_TYPES="$MIME_TYPES;image/jpeg"
+fi
 
 AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
 AC_SUBST(JPEG_LIBS)
@@ -1112,8 +1115,9 @@
 # Check for libpng
 ##################
 
-have_libpng=no
 AC_ARG_WITH(libpng,  [  --without-libpng        build without PNG support])
+
+have_libpng=no
 if test "x$with_libpng" != xno; then
   have_libpng=yes
   PKG_CHECK_MODULES(PNG, libpng,
@@ -1137,20 +1141,20 @@
 # Check for libmng
 ##################
 
-have_libmng=no
 AC_ARG_WITH(libmng,  [  --without-libmng        build without MNG support])
-  have_libmng=yes
-  if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
-     test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
-    AC_CHECK_LIB(mng, mng_create,
-      [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
-      [have_libmng="no (MNG library not found)"], -lz -lm)
-    if test "$mng_ok" = yes; then
-      FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"
-    else
-      have_libmng="no (MNG header file not found)"
-    fi
+
+have_libmng=yes
+if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
+   test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
+  AC_CHECK_LIB(mng, mng_create,
+    [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
+    [have_libmng="no (MNG library not found)"], -lz -lm)
+  if test "$mng_ok" = yes; then
+    FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"
+  else
+    have_libmng="no (MNG header file not found)"
   fi
+fi
 
 AC_SUBST(FILE_MNG)
 AC_SUBST(MNG_LIBS)
@@ -1162,8 +1166,9 @@
 # avoid destruction, but no data modification is performed.
 ############################################################
 
-have_libexif=no
 AC_ARG_WITH(libexif,  [  --without-libexif       build without EXIF support])
+
+have_libexif=no
 if test "x$with_libexif" != xno && test -z "$EXIF_LIBS" && test -n "$JPEG_LIBS"; then
   have_libexif=yes
   PKG_CHECK_MODULES(EXIF, libexif >= exif_required_version,
@@ -1179,9 +1184,9 @@
 # Check for libaa
 #################
 
+AC_ARG_WITH(aa,  [  --without-aa            do not build the AA plug-in])
 
 have_libaa=no
-AC_ARG_WITH(aa,  [  --without-aa            do not build the AA plug-in])
 if test "x$with_aa" != xno && test -z "$AA_LIBS"; then
   have_libaa=yes
   AC_CHECK_LIB(aa, aa_printf,
@@ -1279,12 +1284,13 @@
 # Allow to disable the print plug-in
 ####################################
 
-enable_print="no (disabled)"
 AC_ARG_WITH(print,[  --without-print         build without print support])
 
+enable_print="no (disabled)"
 if test "x$with_print" != xno; then
-    enable_print="yes"
+  enable_print="yes"
 fi
+
 AM_CONDITIONAL(BUILD_PRINT, test "x$enable_print" == xyes)
 
 
@@ -1292,9 +1298,9 @@
 # Check for libpoppler
 ######################
 
-have_poppler=no
 AC_ARG_WITH(poppler,[  --without-poppler       build without poppler support])
 
+have_poppler=no
 if test "x$with_poppler" != xno; then
   PKG_CHECK_MODULES(POPPLER,
     poppler-glib >= poppler_required_version gthread-2.0,
@@ -1444,9 +1450,9 @@
 # Check for alsa
 ################
 
-have_alsa=no
 AC_ARG_WITH(alsa, [  --without-alsa          disable alsa support in midi input controller])
 
+have_alsa="no (alsa support disabled)"
 if test "x$with_alsa" != xno; then
   have_alsa=yes
   AM_PATH_ALSA(alsa_required_version,
@@ -1461,7 +1467,7 @@
 
 AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input event controller module])
 
-have_linux_input=no
+have_linux_input="no (linux input support disabled)"
 if test "x$with_linux_input" != "xno"; then
   AC_CHECK_HEADER(linux/input.h,
 	AC_CHECK_DECL(KEY_OK,
@@ -1517,11 +1523,9 @@
 have_dbus_glib="no (disabled)"
 
 if test "x$with_dbus" != xno; then
-
-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_required_version,
-  have_dbus_glib=yes,
-  have_dbus_glib=no)
-
+  PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_required_version,
+    have_dbus_glib=yes,
+    have_dbus_glib=no)
 fi
 
 if test "x$have_dbus_glib" = xyes; then
@@ -1552,11 +1556,10 @@
 fi
 
 if test "x$have_linux_input" = xyes && test "x$have_dbus_glib" = xyes &&
-    test "x$with_hal" != xno; then
+   test "x$with_hal" != xno; then
   PKG_CHECK_MODULES(HAL, hal >= libhal_required_version,
     have_libhal=yes,
-    have_libhal="no (libhal not found)"
-    )
+    have_libhal="no (libhal not found)")
 fi
 
 if test "x$have_libhal" = xyes; then
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]