summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTar Committer <tar@ocjtech.us>2004-03-14 17:00:09 +0000
committerTar Committer <tar@ocjtech.us>2004-03-14 17:00:09 +0000
commit381d322caf5928732f3d478d80e70acfccd67f99 (patch)
treed52aa26f9698cd869eca3f09661bfc05a7008a28 /configure.in
parent989312339ea2e16579803a48700628c5469e327a (diff)
downloadrancid-381d322caf5928732f3d478d80e70acfccd67f99.tar.gz
rancid-381d322caf5928732f3d478d80e70acfccd67f99.tar.xz
rancid-381d322caf5928732f3d478d80e70acfccd67f99.zip
Imported from rancid-2.3.tar.gz.rancid-2.3
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in83
1 files changed, 58 insertions, 25 deletions
diff --git a/configure.in b/configure.in
index 597b49e..cab2f8d 100644
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,36 @@ AC_TYPE_SIZE_T
# Package-specific options/knobs
#
+# Check if user wants us to create LOCALSTATEDIR. If it's a package-system,
+# they might create it themselves for book-keeping sake; eg: NetBSD
+AC_MSG_CHECKING([whether to create the local state directory at install time])
+AC_ARG_ENABLE(mk-localstatedir,
+ AS_HELP_STRING([--enable-mk-localstatedir], [enable creation of the local state directory at install time (default: yes)]),
+[if test "$enable_mk_localstatedir" = yes; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi],
+[AC_MSG_RESULT(yes)
+ enable_mk_localstatedir="yes"
+])
+AM_CONDITIONAL([MK_LCLSTATEDIR], [test "${enable_mk_localstatedir}" = yes])
+
+# Check if user wants us to create LOCALSTATEDIR. If it's a package-system,
+# they might create it themselves for book-keeping sake; eg: NetBSD
+AC_MSG_CHECKING([whether to install sample .conf files in sysconfdir])
+AC_ARG_ENABLE(conf-install,
+ AS_HELP_STRING([--enable-conf-install], [enable install of sample .conf files in sysconfdir (default: yes)]),
+[if test "$enable_conf_install" = yes; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi],
+[AC_MSG_RESULT(yes)
+ enable_conf_install="yes"
+])
+AM_CONDITIONAL([CONF_INSTALL], [test "${enable_conf_install}" = yes])
+
# Check for a preference for using mail addresses like rancid+group
# instead of the standard rancid-group
AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
@@ -81,49 +111,55 @@ rd_cv_MAILPLUS=$MAILPLUS
# Check for a preference for using mail addresses like rancid+admin-group
# instead of the standard rancid-admin-group
-AC_MSG_CHECKING([whether admin mail addresses should be in the rancid+ form])
+AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
AC_ARG_ENABLE(adminmail-plus,
AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
[if test "$enable_adminmail_plus" = yes; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([rancid-admin+])
ADMINMAILPLUS="rancid-admin+"
AC_SUBST(ADMINMAILPLUS)
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([${MAILPLUS}admin-])
ADMINMAILPLUS="${MAILPLUS}admin-"
AC_SUBST(ADMINMAILPLUS)
fi],
-[AC_MSG_RESULT(no)
+[AC_MSG_RESULT([${MAILPLUS}admin-])
ADMINMAILPLUS="${MAILPLUS}admin-"
AC_SUBST(ADMINMAILPLUS)
])
rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
AC_PATH_PROG(DIRNAME,dirname,no)
+
# locate GNU diff (one supporting the -u option)
-AC_PATH_PROG(DIFF,diff,no, /usr/local/bin:/usr/gnu/bin:/usr/bin:/usr/contrib/bin)
-if test $DIFF = no; then
- unset ac_cv_path_DIFF
- AC_MSG_ERROR([can't locate diff.])
-else
- $DIFF -u /dev/null /dev/null > /dev/null 2>&1
- if test $? -ne 0; then
- $DIFF -C 2 /dev/null /dev/null > /dev/null 2>&1
+AC_MSG_CHECKING([for a diff(1) that supports -u])
+_DIFF_PATH=`echo $PATH:${prefix}/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:/usr/gnu/bin:/usr/contrib/bin | sed -e 's/:/ /g'`
+for _diff in ${_DIFF_PATH} ;
+do
+ if test -e ${_diff}/diff ; then
+ ${_diff}/diff -u /dev/null /dev/null > /dev/null 2>&1
if test $? -ne 0; then
- $DIFF -c2 /dev/null /dev/null > /dev/null 2>&1
- if test $? -ne 0; then
- AC_MSG_ERROR([can't locate a diff which accepts the -u option.])
- exit 1
- else
- DIFF_CMD="diff -c4"
+ if test "${ADIFF}" == "" ; then
+ ADIFF="${_diff}/diff"
+ ADIFF_CMD="diff -c -4"
fi
else
- DIFF_CMD="diff -C 4"
+ DIFF="${_diff}/diff"
+ DIFF_CMD="diff -u -4"
+ break
fi
- else
- DIFF_CMD="diff -u -4"
fi
+done
+if test "$DIFF" = "" ; then
+ DIFF=$ADIFF
+ DIFF_CMD=$ADIFF_CMD
fi
+if test "$DIFF" = "" ; then
+ AC_MSG_ERROR([can't locate diff.])
+fi
+AC_MSG_RESULT([${DIFF_CMD}])
+rd_cv_DIFF=$DIFF
+AC_SUBST(DIFF)
rd_cv_DIFF_CMD=$DIFF_CMD
AC_SUBST(DIFF_CMD)
@@ -210,10 +246,7 @@ ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_RSH`"
AC_PATH_PROG(SORT,sort,no)
ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_SORT`"
AC_PATH_PROG(SSH,ssh,no)
-if test $DIFF = no; then
- ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_SSH`"
-fi
-unset ac_cv_path_SSH
+ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_SSH`"
AC_PATH_PROG(TELNET,telnet,no)
ENV_PATH="$ENV_PATH:`dirname $ac_cv_path_TELNET`"
AC_PATH_PROG(TOUCH,touch,no)