Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: linux-ha by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 25 Nov 2005 08:19:36 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Improve PF_ARGV_TYPE setting. Ensure is PF_ARGV_NONE for Solaris. (Also
bugzilla 967.)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -3 -r1.471 -r1.472
--- configure.in 9 Nov 2005 14:20:12 -0000 1.471
+++ configure.in 25 Nov 2005 15:19:34 -0000 1.472
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.471 $) dnl cvs revision
+AC_REVISION($Revision: 1.472 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -32,12 +32,23 @@
INIT_EXT=""
USE_MODULES=0
echo Our Host OS: $host_os/$host
+
+dnl This OS-based decision-making is poor autotools practice;
+dnl feature-based mechanisms are strongly preferred.
+dnl
+dnl So keep this section to a bare minimum; regard as a "necessary evil".
+
+pf_argv_set=""
case "$host_os" in
*bsd*) LIBS="-L/usr/local/lib"
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
INIT_EXT=".sh"
;;
+*solaris*)
+ pf_argv_set="PF_ARGV_NONE"
+ ;;
+
*linux*) USE_MODULES=1
;;
dnl anything?
@@ -1922,33 +1933,30 @@
ac_cv_func_setproctitle="yes" ; LIBS="$LIBS -lutil"])
if test "$ac_cv_func_setproctitle" = "yes"; then
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_NONE, [ ])
-else
- pf_argv_set="no"
+ pf_argv_set="PF_ARGV_NONE"
+fi
+if test "$pf_argv_set" = ""; then
AC_CHECK_HEADERS(sys/pstat.h)
if test "$ac_cv_header_pstat_h" = "yes"; then
AC_CHECK_FUNCS(pstat)
if test "$ac_cv_func_pstat" = "yes"; then
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_PSTAT, [ ])
+ pf_argv_set="PF_ARGV_PSTAT"
else
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_WRITABLE, [ ])
+ pf_argv_set="PF_ARGV_WRITEABLE"
fi
-
- pf_argv_set="yes"
fi
- if test "$pf_argv_set" = "no"; then
+ if test "$pf_argv_set" = ""; then
AC_EGREP_HEADER([#define.*PS_STRINGS.*],sys/exec.h,
have_psstrings="yes",have_psstrings="no")
if test "$have_psstrings" = "yes"; then
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_PSSTRINGS, [ ])
- pf_argv_set="yes"
+ pf_argv_set="PF_ARGV_PSSTRINGS"
fi
fi
- if test "$pf_argv_set" = "no"; then
+ if test "$pf_argv_set" = ""; then
AC_CACHE_CHECK(whether __progname and __progname_full are available,
pf_cv_var_progname,
AC_TRY_LINK([extern char *__progname, *__progname_full;],
@@ -1968,15 +1976,16 @@
],pf_cv_argv_type="new", pf_cv_argv_type="writeable"))
if test "$pf_cv_argv_type" = "new"; then
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_NEW, [ ])
- pf_argv_set="yes"
+ pf_argv_set="PF_ARGV_NEW"
fi
- if test "$pf_argv_set" = "no"; then
- AC_DEFINE(PF_ARGV_TYPE, PF_ARGV_WRITEABLE, [ ])
+ if test "$pf_argv_set" = ""; then
+ pf_argv_set="PF_ARGV_WRITEABLE"
fi
fi
fi
+AC_DEFINE_UNQUOTED(PF_ARGV_TYPE, $pf_argv_set,
+ mechanism to pretty-print ps output: setproctitle-equivalent)
dnl End of tests borrowed from Proftpd
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 67
********************************************
