A number of options to configure have been added as --with/--without
(AC_ARG_WITH) when they should rightfully be --enable/--disable
(AC_ARG_ENABLE)
A quick scan of configure.ac reveals options --with-proper,
--with-full-port and --with-soft-is-hard that are good candidates to
become --enable-proper, --enable-full-port and --enable-soft-is-hard.
Below is a patch to make the change. When it is committed
nmi_glue/build/remote_pre will also need to be changed to use
--enable-soft-is-hard instead of --with-soft-is-hard.
Thoughts?
Thanks to Zach for pointing this out yesterday.
Best,
matt
--
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 61dd17b..68a7d79 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -77,12 +77,12 @@ fi
# help string,
# test)
#
-# Check for an external. If $PROPER is defined to "yes" perform the
-# external check with the provided test function ($5), otherwise use
-# the default check for an external directory. The help string ($4) is
-# also ignored if $PROPER is not "yes". _cv_has_<name> is checked to
-# see if the external should detected. If _cv_has_<name> is no and the
-# requirement is hard an error is raised.
+# Check for an external. If $enable_proper is defined to "yes" perform
+# the external check with the provided test function ($5), otherwise
+# use the default check for an external directory. The help string
+# ($4) is also ignored if $enable_proper is not "yes". _cv_has_<name>
+# is checked to see if the external should detected. If _cv_has_<name>
+# is no and the requirement is hard an error is raised.
#
# Example usage:
# CHECK_EXTERNAL([pcre], [5.0], [hard],
@@ -116,7 +116,7 @@ AC_DEFUN([CHECK_EXTERNAL],
[AC_MSG_FAILURE([$1 required but unsupported])],
[AC_MSG_CHECKING([for $1])
AC_MSG_RESULT([unsupported])])],
- [AS_IF([test "x$PROPER" = xyes],
+ [AS_IF([test "x$enable_proper" = xyes],
[MF_EXTERNAL_CHECK($1, $2, $4, $3, [$5])],
[MF_EXTERNAL_CHECK($1, $2, $4, $3, CONDOR_EXTERNAL_VERSION($1,
$2))])])]
@@ -127,13 +127,13 @@ AC_DEFUN([CHECK_EXTERNAL],
# requierment_level,
# test)
#
-# This function is the framework for detecting externals PROPERly,
-# i.e. externals present on the system not in special directories
-# waiting to be built. The test function ($5) does the work of
-# actually detecting an external, while this function worries about
-# the requirement_level ($4), if --with-<name> or --without-<name> is
-# given, if --enable-soft-is-hard is given, and what should happen
-# when the external is found or not.
+# This function is the framework for detecting externals under
+# enable_proper, i.e. externals present on the system not in special
+# directories waiting to be built. The test function ($5) does the
+# work of actually detecting an external, while this function worries
+# about the requirement_level ($4), if --with-<name> or
+# --without-<name> is given, if --enable-soft-is-hard is given, and
+# what should happen when the external is found or not.
#
# Arguments:
# Exactly the same as those given to CHECK_EXTERNAL
@@ -161,7 +161,7 @@ AC_DEFUN([MF_EXTERNAL_CHECK],
# if a soft requirement
AS_IF([test "x$4" = xsoft],
# external is a soft requirement, but soft->hard turned on
- [AS_IF([test "x$SOFT_IS_HARD" = xyes],
+ [AS_IF([test "x$enable_soft_is_hard" = xyes],
[_required=yes],
# else, just a soft requirement
[_required=no])],
@@ -253,7 +253,8 @@ AC_DEFUN([MF_LIB_CHECK],
# print out "checking <name> ... <version>, and we do a variable
# substitution in our output files for "ext_<name>_version".
#
-# Modifications by Matt, for use in CHECK_EXTERNAL when PROPER is off:
+# Modifications by Matt, for use in CHECK_EXTERNAL when enable_proper
+# is off:
# * Sets cv_ext_<name> to yes or no if the external is available or
not
# * All exit points via a failure are changed to warnings, because
# MF_EXTERNAL_CHECK will properly exit based on how required the
diff --git a/src/configure.ac b/src/configure.ac
index af0150f..bec631a 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -501,27 +501,23 @@ AC_ARG_WITH(buildid,
[BUILDID=$withval],
[BUILDID=no])
-AC_ARG_WITH(proper,
- [AS_HELP_STRING([--with-proper],
- [Force this configure script to work in the proper (non-Condor)
way])],
- [PROPER=$withval],
- [PROPER=no])
-
-AC_ARG_WITH(full-port,
- [AS_HELP_STRING([--with-full-port],
- [Perform a full build, i.e. Standard Universe included])],
- [if test "x$withval" = xyes; then
- CLIPPED=no
- else
- CLIPPED=yes
- fi],
- [CLIPPED=default])
+AC_ARG_ENABLE(proper,
+ [AS_HELP_STRING([--enable-proper],
+ [Force this configure script to work in the proper (non-Condor)
way (defau
+ [],
+ [enable_proper=no])
-AC_ARG_WITH(soft-is-hard,
- [AS_HELP_STRING([--with-soft-is-hard],
- [Force all SOFT requirements into HARD requirements])],
- [SOFT_IS_HARD=$withval],
- [SOFT_IS_HARD=no])
+AC_ARG_ENABLE(full-port,
+ [AS_HELP_STRING([--enable-full-port],
+ [Perform a full build, i.e. Standard Universe included (default:
enabled)])
+ [CLIPPED=$(test $enableval == yes && echo no || echo yes)],
+ [CLIPPED=default])
+echo xxx $CLIPPED
+AC_ARG_ENABLE(soft-is-hard,
+ [AS_HELP_STRING([--enable-soft-is-hard],
+ [Force all SOFT requirements into HARD requirements (default:
disabled)])]
+ [],
+ [enable_soft_is_hard=no])
# if we want a buildid, jam it into CPPFLAGS
AC_MSG_CHECKING(for a build id to use)
@@ -533,7 +529,7 @@ else
fi
# If we are being proper we don't want to look for "externals"
-AS_IF([test "x$PROPER" != xyes],
+AS_IF([test "x$enable_proper" != xyes],
[
ac_cv_has_externals=YES
ac_cv_externals=none
@@ -2088,7 +2084,7 @@ AS_IF([test "x$enable_static" != xno -a
"$_cv_has_static"
# Check for externals, if we are going to use them
#
-if test "x$ac_cv_has_externals" = "xYES" -o "x$PROPER" = xyes ; then
+if test "x$ac_cv_has_externals" = "xYES" -o "x$enable_proper" = xyes
; then
AC_MSG_NOTICE([determining availability of external packages])
@@ -2433,7 +2429,7 @@ CHECK_EXTERNAL([gsoap], [2.7.6c-p2], [soft],
# We need to make sure HAVE_OPENSSL_SSL_H is defined otherwise
# programs will not link properly as stdsoap2.h will not include ssl
# structures. This is set manually if using Globus's OpenSSL.
-AS_IF([test "x$cv_ext_gsoap" = xyes -a "x$PROPER" = xyes],
+AS_IF([test "x$cv_ext_gsoap" = xyes -a "x$enable_proper" = xyes],
[AC_CHECK_HEADERS([openssl/ssl.h], [],
[AC_MSG_ERROR([gsoap in proper mode requires openssl/ssl.h])])])
@@ -2518,7 +2514,7 @@ else
AC_SUBST(ext_glibc_version,UNUSED)
fi
-# END of if $ac_cv_has_externals = "YES" or $PROPER = yes
+# END of if $ac_cv_has_externals = "YES" or $enable_proper = yes
############################################################
_______________________________________________
Condor-devel mailing list
Condor-devel@xxxxxxxxxxx
https://lists.cs.wisc.edu/mailman/listinfo/condor-devel
