From: Theodore Tso <tytso@mit.edu>
Date: Sat, 28 Feb 1998 02:46:09 +0000 (+0000)
Subject: configure.in: Move the regular expression function tests into
X-Git-Tag: krb5-1.1-beta1~795
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=561e378ce40c17ffb342abe74d11f9e460c9a319;p=krb5.git

configure.in: Move the regular expression function tests into
	aclocal.m4, since they also need to be shared by lib/kadm5's configure
	script.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10478 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index c8a454e32..01200af2a 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,5 +1,9 @@
 Fri Feb 27 18:00:15 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
+	* configure.in: Move the regular expression function tests into
+		aclocal.m4, since they also need to be shared by
+		lib/kadm5's configure script.
+
 	* configure.in: Move tests from all of krb5's subdirectories into
 		this configure.in, and make it generate makefiles for all
 		of the subdirectories.
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 4cf6009ce..1f924319a 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -8,31 +8,9 @@ AC_TYPE_UID_T
 HAS_ANSI_VOLATILE
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h)
-AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid re_comp)
+AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid)
 AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
-dnl
-dnl regcomp is present but non-functional on Solaris 2.4
-dnl
-AC_C_CROSS
-AC_MSG_CHECKING(for working regcomp)
-AC_CACHE_VAL(ac_cv_func_regcomp,[
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <regex.h>
-regex_t x; regmatch_t m;
-int main() { return regcomp(&x,"pat.*",0) || regexec(&x,"pattern",1,&m,0); }
-], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no)])
-AC_MSG_RESULT($ac_cv_func_regcomp)
-test $ac_cv_func_regcomp = yes && AC_DEFINE(HAVE_REGCOMP)
-save_LIBS="$LIBS"
-LIBS=-lgen
-dnl this will fail if there's no compile/step in -lgen, or if there's
-dnl no -lgen.  This is fine.
-AC_CHECK_FUNCS(compile step)
-LIBS="$save_LIBS"
-dnl
-AC_CHECK_LIB(gen,compile,SHLIB_GEN=-lgen,SHLIB_GEN='')
-AC_SUBST(SHLIB_GEN)
+KRB5_AC_REGEX_FUNCS
 dnl
 KRB5_BUILD_LIBRARY_WITH_DEPS
 KRB5_BUILD_LIBOBJS