Merge from vendor branch TEXINFO:
[dragonfly.git] / secure / lib / libssh / porting / configure.ac.patch
1 $DragonFly: src/secure/lib/libssh/porting/Attic/configure.ac.patch,v 1.1 2004/07/31 20:05:00 geekgod Exp $
2 --- configure.ac.orig   2004-04-17 05:03:07.000000000 +0200
3 +++ configure.ac        2004-07-10 14:11:30.000000000 +0200
4 @@ -759,6 +760,41 @@
5         ]
6  )
7  
8 +# Check whether user wants OPIE support
9 +OPIE_MSG="no" 
10 +AC_ARG_WITH(opie,
11 +       [  --with-opie[[=PATH]]      Enable OPIE support
12 +                            (optionally in PATH)],
13 +       [
14 +               if test "x$withval" != "xno" ; then
15 +
16 +                       if test "x$withval" != "xyes" ; then
17 +                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
18 +                               LDFLAGS="$LDFLAGS -L${withval}/lib"
19 +                       fi
20 +
21 +                       AC_DEFINE(SKEY)
22 +                       AC_DEFINE(OPIE)
23 +                       LIBS="-lopie $LIBS"
24 +                       OPIE_MSG="yes" 
25 +       
26 +                       AC_MSG_CHECKING([for opie support])
27 +                       AC_TRY_RUN(
28 +                               [
29 +#include <sys/types.h>
30 +#include <stdio.h>
31 +#include <opie.h>
32 +int main() { char *ff = opie_keyinfo(""); ff=""; return 0; }
33 +                               ],
34 +                               [AC_MSG_RESULT(yes)],
35 +                               [
36 +                                       AC_MSG_RESULT(no)
37 +                                       AC_MSG_ERROR([** Incomplete or missing opie libraries.])
38 +                               ])
39 +               fi
40 +       ]
41 +)
42 +
43  # Check whether user wants TCP wrappers support
44  TCPW_MSG="no"
45  AC_ARG_WITH(tcp-wrappers,
46 @@ -2063,7 +2099,11 @@
47                 ac_cv_have_getopt_optreset, [
48         AC_TRY_LINK(
49                 [
50 +#if HAVE_GETOPT_H
51  #include <getopt.h>
52 +#elif HAVE_UNISTD_H
53 +#include <unistd.h>
54 +#endif
55                 ],
56                 [ extern int optreset; optreset = 0; ],
57                 [ ac_cv_have_getopt_optreset="yes" ],
58 @@ -2914,6 +2954,7 @@
59  echo "                 KerberosV support: $KRB5_MSG"
60  echo "                 Smartcard support: $SCARD_MSG"
61  echo "                     S/KEY support: $SKEY_MSG"
62 +echo "                      OPIE support: $OPIE_MSG"
63  echo "              TCP Wrappers support: $TCPW_MSG"
64  echo "              MD5 password support: $MD5_MSG"
65  echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"