Patch configure.in to fix krb building problems when not wanting to build krb

Add dependency to AUTOCONF

Submitted by:	petef
This commit is contained in:
David W. Chapman Jr. 2001-12-24 04:50:51 +00:00
parent 6b85cc8717
commit 06f89fdeff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=52079
4 changed files with 62 additions and 2 deletions

View file

@ -34,7 +34,7 @@ SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default
DOCSDIR= ${PREFIX}/share/doc/samba
NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
--with-sambabook=${PREFIX}/share/swat/using_samba \
@ -45,6 +45,8 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
.else
CONFIGURE_ARGS+= --with-krb5=no
.endif
.if defined(WITH_CUPS)

View file

@ -0,0 +1,28 @@
--- configure.in.orig Thu Dec 13 08:19:58 2001
+++ configure.in Sun Dec 23 23:39:48 2001
@@ -1642,10 +1642,9 @@
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
+
+ # don't automatically detect krb5 stuff, only do it if --with-krb5=foo
+ # is given (and isn't 'no').
# now check for krb5.h. Some systems have the libraries without the headers!
# note that this check is done here to allow for different kerberos
@@ -1669,6 +1668,11 @@
AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5";
AC_DEFINE(HAVE_KRB5)])
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+# end of --with-krb5 check
##################################################################
# we might need the lber lib on some systems. To avoid link errors

View file

@ -34,7 +34,7 @@ SAMPLE_CONFIG= ${SAMBA_CONFDIR}/smb.conf.default
DOCSDIR= ${PREFIX}/share/doc/samba
NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
--with-sambabook=${PREFIX}/share/swat/using_samba \
@ -45,6 +45,8 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
.else
CONFIGURE_ARGS+= --with-krb5=no
.endif
.if defined(WITH_CUPS)

View file

@ -0,0 +1,28 @@
--- configure.in.orig Thu Dec 13 08:19:58 2001
+++ configure.in Sun Dec 23 23:39:48 2001
@@ -1642,10 +1642,9 @@
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
+
+ # don't automatically detect krb5 stuff, only do it if --with-krb5=foo
+ # is given (and isn't 'no').
# now check for krb5.h. Some systems have the libraries without the headers!
# note that this check is done here to allow for different kerberos
@@ -1669,6 +1668,11 @@
AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5";
AC_DEFINE(HAVE_KRB5)])
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+# end of --with-krb5 check
##################################################################
# we might need the lber lib on some systems. To avoid link errors