changeset 11041:696829b6445b

configure.ac: style fixes
author John W. Eaton <jwe@octave.org>
date Wed, 29 Sep 2010 02:24:41 -0400
parents 9ac165a67747
children f6b7b6e5b8b8
files ChangeLog configure.ac
diffstat 2 files changed, 25 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29  John W. Eaton  <jwe@octave.org>
+
+	* configure.ac: Style fixes.
+
 2010-09-29  John P. Swensen  <jpswensen@gmail.com>
 
 	* configure.ac: Allow selection of GraphicsMagick or ImageMagick
--- a/configure.ac
+++ b/configure.ac
@@ -767,11 +767,11 @@
 
 ### Graphics/ImageMagick++
 
-  AC_ARG_WITH(magick,
-          [  --with-magick=LIB   Library to use for image IO (options: GraphicsMagick(default) or ImageMagick)],
-          magick="$withval",
-          magick="GraphicsMagick")
-
+AC_ARG_WITH([magick], [
+  AS_HELP_STRING([--with-magick=LIB],
+    [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], [
+  magick="$withval"], [
+  magick="GraphicsMagick"])
 
 warn_magick="$magick++ library not found.  The imread function for reading image files will not be fully functional."
 
@@ -780,9 +780,10 @@
 MAGICK_LIBS=
 
 PKG_CHECK_EXISTS([$magick++], [
-  ## Make sure we only get -I, -L and -l flags. Some Graphics/ImageMagick++
+  ## Make sure we only get -I, -L and -l flags.  Some Graphics/ImageMagick++
   ## packages adds extra flags that are useful when building
-  ## Graphics/ImageMagick++ extentions. These extra flags break the Octave build.
+  ## Graphics/ImageMagick++ extentions.  These extra flags break the
+  ## Octave build. 
   MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
   MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
   MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
@@ -852,14 +853,18 @@
   fi
 
   ## fltk (www.fltk.org)
-  AC_ARG_WITH(fltk-prefix,
-          [  --with-fltk-prefix=PFX   Prefix where FLTK is installed (optional)],
-          fltk_prefix="$withval",
-          fltk_prefix="")
-  AC_ARG_WITH(fltk-exec-prefix,
-          [  --with-fltk-exec-prefix=PFX Exec prefix where FLTK is installed (optional)],
-          fltk_exec_prefix="$withval", 
-          fltk_exec_prefix="")
+
+  AC_ARG_WITH([fltk-prefix], [
+    AS_HELP_STRING([--with-fltk-prefix=PFX],
+      [Prefix where FLTK is installed (optional)])], [
+    fltk_prefix="$withval"], [
+    fltk_prefix=""])
+
+  AC_ARG_WITH([fltk-exec-prefix], [
+    AS_HELP_STRING([--with-fltk-exec-prefix=PFX],
+      [Exec prefix where FLTK is installed (optional)])], [
+    fltk_exec_prefix="$withval"], [
+    fltk_exec_prefix=""])
 
   if test -n "$fltk_exec_prefix"; then
     fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix"
@@ -875,7 +880,7 @@
     fi
   fi
 
-  AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
+  AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no])
 
   warn_fltk_config=""
   warn_fltk_opengl=""
@@ -2433,10 +2438,6 @@
   warn_msg_printed=true
 fi
 
-
-
-
-
 if $warn_msg_printed; then
   AC_MSG_NOTICE([])
   AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR])