[m-dev.] diff: fix order of options for `configure --help'

[Fergus Henderson]

Estimated hours taken: 0.5

configure.in:
	Move some code around, in order to change the order of the
	AC_ARG_ENABLE macros, so the various options to configure get
	listed in a sensible order in the output of `configure --help'.
	Previously they were in pretty much random order.
	I changed it so that all the grade options come first,
	then the options for disabling debuggers, then miscellanous
	--enable/--disable options, then --with/--without options.

----------

First, here's a diff of the output of configure --help.

diff -c /tmp/f0.old /tmp/f0
*** /tmp/f0.old	Sat Jan 13 18:15:45 2001
--- /tmp/f0	Sat Jan 13 18:15:32 2001
***************
*** 39,60 ****
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --x-includes=DIR        X include files are in DIR
    --x-libraries=DIR       X library files are in DIR
  --enable and --with options recognized:
-   --disable-dynamic-link  disable the use of dynamic linking
    --enable-inefficient-grades
                            install inefficient versions of the library
    --disable-most-grades   install only the essential versions of the library
    --disable-nogc-grades   do not install no-gc versions of the library
    --disable-prof-grades   do not install profiling versions of the library
    --disable-trail-grades  do not install trailing versions of the library
    --disable-par-grades    do not install thread-safe versions of the library
    --enable-hlc-prof-grades
                            install profiling versions of the high level C grade
    --enable-libgrades=...  install exactly the given versions of the library
    --disable-decl-debug    disable the declarative debugger
    --enable-new-mercuryfile-struct
                            enable new MercuryFile struct.
-   --disable-extern-debug  disable the external (separate process) debugger
    --without-readline      Don't use the GPL'd GNU readline library
--- 39,60 ----
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --x-includes=DIR        X include files are in DIR
    --x-libraries=DIR       X library files are in DIR
  --enable and --with options recognized:
    --enable-inefficient-grades
                            install inefficient versions of the library
    --disable-most-grades   install only the essential versions of the library
    --disable-nogc-grades   do not install no-gc versions of the library
    --disable-prof-grades   do not install profiling versions of the library
    --disable-trail-grades  do not install trailing versions of the library
    --disable-par-grades    do not install thread-safe versions of the library
    --enable-hlc-prof-grades
                            install profiling versions of the high level C grade
    --enable-libgrades=...  install exactly the given versions of the library
    --disable-decl-debug    disable the declarative debugger
+   --disable-extern-debug  disable the external (separate process) debugger
+   --disable-dynamic-link  disable the use of dynamic linking
    --enable-new-mercuryfile-struct
                            enable new MercuryFile struct.
    --without-readline      Don't use the GPL'd GNU readline library

----------

Now, here's the diff for the source code change.

Workspace: /home/pgrad/fjh/ws/gcc/mercury
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.239
diff -u -d -r1.239 configure.in
--- configure.in	2001/01/01 04:03:22	1.239
+++ configure.in	2001/01/13 07:04:04
@@ -398,31 +398,6 @@
 fi
 #-----------------------------------------------------------------------------#
 #
-# Check for dynamic linking, unless the --disable-dynamic-link option
-# was specified.
-#
-AC_ARG_ENABLE(dynamic-link,
-[  --disable-dynamic-link  disable the use of dynamic linking],
-mercury_cv_enable_dynamic_link="$enableval",mercury_cv_enable_dynamic_link=yes)
-if test "$mercury_cv_enable_dynamic_link" = "yes"; then
-	AC_CHECK_HEADER(dlfcn.h, HAVE_DLFCN_H=1)
-	if test "$HAVE_DLFCN_H" = 1; then
-		AC_DEFINE(HAVE_DLFCN_H)
-	fi
-	AC_CHECK_LIB(dl, dlopen, DL_LIBRARY="-ldl", DL_LIBRARY="")
-	AC_SUBST(DL_LIBRARY)
-
-	# temporarily add $DL_LIBRARY to LIBS while we check for dlopen etc.
-	save_LIBS="$LIBS"
-	LIBS="$LIBS $DL_LIBRARY"
-
-	AC_HAVE_FUNCS(dlopen dlclose dlsym dlerror)
-
-	# restore old value of LIBS
-	LIBS="$save_LIBS"
-fi
-#-----------------------------------------------------------------------------#
-#
 # check the basics of sigaction
 #
 if test "$ac_cv_func_sigaction" = yes; then
@@ -2617,21 +2592,6 @@
 LIBS="$save_LIBS"
 
 #-----------------------------------------------------------------------------#
-
-AC_MSG_CHECKING(whether to enable the new MercuryFile struct)
-AC_ARG_ENABLE(new-mercuryfile-struct,
-[  --enable-new-mercuryfile-struct
-                          enable new MercuryFile struct.],
-ac_new_mercuryfile_struct=yes,ac_new_mercuryfile_struct=no)
-
-if test "$ac_new_mercuryfile_struct" = "yes"; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(MR_NEW_MERCURYFILE_STRUCT)
-else
-	AC_MSG_RESULT(no)
-fi
-
-#-----------------------------------------------------------------------------#
 #
 # Add an option that enables the external debugger support.
 # By default, external debugger support is enabled if and only if
@@ -2667,6 +2627,46 @@
 
 AC_SUBST(SOCKET_LIBRARY)
 AC_SUBST(NSL_LIBRARY)
+#-----------------------------------------------------------------------------#
+#
+# Check for dynamic linking, unless the --disable-dynamic-link option
+# was specified.
+#
+AC_ARG_ENABLE(dynamic-link,
+[  --disable-dynamic-link  disable the use of dynamic linking],
+mercury_cv_enable_dynamic_link="$enableval",mercury_cv_enable_dynamic_link=yes)
+if test "$mercury_cv_enable_dynamic_link" = "yes"; then
+	AC_CHECK_HEADER(dlfcn.h, HAVE_DLFCN_H=1)
+	if test "$HAVE_DLFCN_H" = 1; then
+		AC_DEFINE(HAVE_DLFCN_H)
+	fi
+	AC_CHECK_LIB(dl, dlopen, DL_LIBRARY="-ldl", DL_LIBRARY="")
+	AC_SUBST(DL_LIBRARY)
+
+	# temporarily add $DL_LIBRARY to LIBS while we check for dlopen etc.
+	save_LIBS="$LIBS"
+	LIBS="$LIBS $DL_LIBRARY"
+
+	AC_HAVE_FUNCS(dlopen dlclose dlsym dlerror)
+
+	# restore old value of LIBS
+	LIBS="$save_LIBS"
+fi
+#-----------------------------------------------------------------------------#
+
+AC_MSG_CHECKING(whether to enable the new MercuryFile struct)
+AC_ARG_ENABLE(new-mercuryfile-struct,
+[  --enable-new-mercuryfile-struct
+                          enable new MercuryFile struct.],
+ac_new_mercuryfile_struct=yes,ac_new_mercuryfile_struct=no)
+
+if test "$ac_new_mercuryfile_struct" = "yes"; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(MR_NEW_MERCURYFILE_STRUCT)
+else
+	AC_MSG_RESULT(no)
+fi
+
 #-----------------------------------------------------------------------------#
 MERCURY_CHECK_READLINE
 #-----------------------------------------------------------------------------#

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------