LIB_kdb, have_err_h, have_fnmatch_h, have_glob_h
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5604 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
17
configure.in
17
configure.in
@@ -47,8 +47,10 @@ fi
|
|||||||
|
|
||||||
AC_TEST_PACKAGE(krb4,krb.h,libkrb.a,-lkrb,/usr/athena)
|
AC_TEST_PACKAGE(krb4,krb.h,libkrb.a,-lkrb,/usr/athena)
|
||||||
|
|
||||||
|
LIB_kdb=
|
||||||
if test "$with_krb4"; then
|
if test "$with_krb4"; then
|
||||||
LIB_krb4="$KRB4LIB -ldes"
|
LIB_krb4="$KRB4LIB -ldes"
|
||||||
|
LIB_kdb=-lkdb
|
||||||
INCLUDE_krb4="$KRB4INCLUDE"
|
INCLUDE_krb4="$KRB4INCLUDE"
|
||||||
EXTRA_LIB45=lib45.a
|
EXTRA_LIB45=lib45.a
|
||||||
AC_SUBST(EXTRA_LIB45)
|
AC_SUBST(EXTRA_LIB45)
|
||||||
@@ -69,6 +71,7 @@ fi
|
|||||||
AM_CONDITIONAL(KRB4, test "$with_krb4")dnl
|
AM_CONDITIONAL(KRB4, test "$with_krb4")dnl
|
||||||
AM_CONDITIONAL(KRB5, true)dnl
|
AM_CONDITIONAL(KRB5, true)dnl
|
||||||
AC_SUBST(LIB_krb4)dnl
|
AC_SUBST(LIB_krb4)dnl
|
||||||
|
AC_SUBST(LIB_kdb)dnl
|
||||||
AC_SUBST(INCLUDE_krb4)dnl
|
AC_SUBST(INCLUDE_krb4)dnl
|
||||||
AM_CONDITIONAL(AIX, test "`uname`" = AIX)dnl
|
AM_CONDITIONAL(AIX, test "`uname`" = AIX)dnl
|
||||||
AM_CONDITIONAL(AIX4, test "`uname`" = AIX -a "`uname -v`" = 4)
|
AM_CONDITIONAL(AIX4, test "`uname`" = AIX -a "`uname -v`" = 4)
|
||||||
@@ -255,14 +258,9 @@ AC_CHECK_HEADERS(sys/termio.h sys/tty.h sys/types.h sys/uio.h sys/un.h)
|
|||||||
AC_CHECK_HEADERS(sys/utsname.h sys/wait.h syslog.h termio.h)
|
AC_CHECK_HEADERS(sys/utsname.h sys/wait.h syslog.h termio.h)
|
||||||
AC_CHECK_HEADERS(termios.h time.h tmpdir.h unistd.h util.h utmp.h utmpx.h)
|
AC_CHECK_HEADERS(termios.h time.h tmpdir.h unistd.h util.h utmp.h utmpx.h)
|
||||||
|
|
||||||
if test "$ac_cv_header_err_h" = no; then
|
AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes)
|
||||||
EXTRA_HDRS="$EXTRA_HDRS err.h"
|
AM_CONDITIONAL(have_fnmatch_h, test "$ac_cv_header_fnmatch_h" = yes)
|
||||||
AC_SUBST(EXTRA_HDRS)
|
|
||||||
fi
|
|
||||||
if test "$ac_cv_header_fnmatch_h" = no; then
|
|
||||||
NOINST_HDRS="$NOINST_HDRS fnmatch.h"
|
|
||||||
AC_SUBST(NOINST_HDRS)
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Checks for libraries.
|
dnl Checks for libraries.
|
||||||
|
|
||||||
@@ -320,10 +318,9 @@ AC_BROKEN_VSNPRINTF
|
|||||||
AC_BROKEN_GLOB
|
AC_BROKEN_GLOB
|
||||||
|
|
||||||
if test "$ac_cv_func_glob_working" != yes; then
|
if test "$ac_cv_func_glob_working" != yes; then
|
||||||
NOINST_HDRS="$NOINST_HDRS glob.h"
|
|
||||||
AC_SUBST(NOINST_HDRS)
|
|
||||||
LIBOBJS="$LIBOBJS glob.o"
|
LIBOBJS="$LIBOBJS glob.o"
|
||||||
fi
|
fi
|
||||||
|
AM_CONDITIONAL(have_glob_h, test "$ac_cv_func_glob_working" = yes)
|
||||||
|
|
||||||
dnl these should happen after tests for *snprintf
|
dnl these should happen after tests for *snprintf
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user