heimdal: Fix name of hx509 library.

[kai/samba.git] / source4 / heimdal_build / internal.m4

diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index 5c8d78e56d0346f7b486636924656b5abcfddaa7..433394f1af0c0e9efb3b6a20ae28dd9b0cee5dc7 100644 (file)
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -46,6 +46,15 @@ dnl declarations will be correct). Phew!
 AC_CHECK_HEADERS([err.h], [],
        [ cp heimdal/lib/roken/err.hin heimdal_build/err.h ])
 
+dnl Not all systems have ifaddrs.h, so we provide a replacement. Heimdal
+dnl unconditionally #includes <ifaddrs.h>, so we need to create an ifaddrs.h,
+dnl but we can't just have a static one because we don't want to use
+dnl it on systems that have a real ifaddrs.h. If the system has a real
+dnl ifaddrs.h. We don't use heimdal's lib/roken/ifaddrs.hin because
+dnl our libreplace would conflict with it.
+AC_CHECK_HEADERS([ifaddrs.h], [],
+       [ cp heimdal_build/ifaddrs.hin heimdal_build/ifaddrs.h ])
+
 AC_CHECK_HEADERS([                             \
        crypt.h                                 \
        curses.h                                \
@@ -208,6 +217,8 @@ SMB_ENABLE(compile_et, NO)
 LEX_YACC_COMBINATIONS=""
 LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3"
 LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.34:bison-2.3"
+LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.3"
+LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.4.1"
 
 AC_PROG_LEX
 LEX_BASENAME=`basename "$LEX"`
@@ -227,13 +238,20 @@ AC_PROG_YACC
 YACC_BASENAME=`basename "$YACC"`
 if test x"$YACC_BASENAME" = x"bison -y"; then
        # bison (GNU Bison) 2.3
+       # or
+       # bison (GNU Bison) 2.4.1
        BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
        AC_MSG_CHECKING(bison version)
        AC_MSG_RESULT($BISON_VERSION)
        BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
        BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
+       BISON_RELEASE=`echo $BISON_VERSION | cut -d '.' -f3`
 
-       YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
+       if test x"$BISON_RELEASE" != x""; then
+               YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR.$BISON_RELEASE"
+       else
+               YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
+       fi
 fi
 
 AC_MSG_CHECKING(working LEX YACC combination)