root/trunk/ports/net/macathena-moira/files/patch-configure.in

Revision 2, 3.2 kB (checked in by broder, 17 years ago)

Adding the ports that I've built so far - libhesiod, hesiod, and moira.

Hesiod and libhesiod should probably be submitted upstream to the MacPorts repository instead of ours.

Also, libhesiod doesn't compile as a universal library because libtool hates people

Line 
1 --- configure.in.orig   2006-05-12 16:26:10.000000000 -0400
2 +++ configure.in        2007-12-18 15:53:40.000000000 -0500
3 @@ -1,6 +1,6 @@
4  AC_INIT(patchlevel.h)
5  
6 -dnl On Athena at least, many of the packages (krb, zephyr, hesiod, etc)
7 +dnl On Athena at least, many of the packages (krb, hesiod, etc)
8  dnl will all be in /usr/athena... this hack lets us not end up with 10
9  dnl copies of -I/usr/athena/include -L/usr/athena/lib in our command lines
10  AC_DEFUN(MR_EXTEND, [
11 @@ -115,17 +115,16 @@
12      [  --with-krb4=PREFIX      Specify location of krb4],
13      [krb4="$withval"], [krb4=no])
14  AC_MSG_RESULT($krb4)
15 -if test $krb4 = "no"; then
16 -    AC_MSG_ERROR(Kerberos is required for Moira)
17 -fi
18 -if test "$krb4" != yes; then
19 -    MR_INCLUDE($krb4/include)
20 -    if test -d "$krb4/include/kerberosIV"; then
21 -       MR_INCLUDE($krb4/include/kerberosIV)
22 +if test "$krb4" != no; then
23 +    if test "$krb4" != yes; then
24 +        MR_INCLUDE($krb4/include)
25 +        if test -d "$krb4/include/kerberosIV"; then
26 +        MR_INCLUDE($krb4/include/kerberosIV)
27 +        fi
28 +        MR_LIBS($krb4/lib)
29 +    elif test -d /usr/include/kerberosIV; then
30 +        MR_INCLUDE(/usr/include/kerberosIV)
31      fi
32 -    MR_LIBS($krb4/lib)
33 -elif test -d /usr/include/kerberosIV; then
34 -    MR_INCLUDE(/usr/include/kerberosIV)
35  fi
36  AC_CHECK_LIB(k5crypto, main, crypto="k5crypto",
37               [AC_CHECK_LIB(crypto, main, crypto="crypto")])
38 @@ -143,20 +142,26 @@
39      [krb5="$withval"], [krb5=no])
40  AC_MSG_RESULT($krb5)
41  if test "$krb5" != no; then
42 -    REG_SVR_DEFS=-DKRB5
43      if test "$krb5" != yes; then
44 -       REG_SVR_INCLUDES=-I$krb5/include
45 -       REG_SVR_LIBS=-L$krb5/lib
46 +        REG_SVR_DEFS=-DKRB5
47 +        if test "$krb5" != yes; then
48 +        REG_SVR_INCLUDES=-I$krb5/include
49 +        REG_SVR_LIBS=-L$krb5/lib
50 +        fi
51 +        REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
52 +    else
53 +        REG_SVR_DEFS=-DKRB4
54 +        REG_SVR_LIBS=-lkadm
55      fi
56 -    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
57 -else
58 -    REG_SVR_DEFS=-DKRB4
59 -    REG_SVR_LIBS=-lkadm
60  fi
61  AC_SUBST(REG_SVR_DEFS)
62  AC_SUBST(REG_SVR_INCLUDES)
63  AC_SUBST(REG_SVR_LIBS)
64  
65 +if test $krb5 = "no" -a $krb4 = "no"; then
66 +    AC_MSG_ERROR(Kerberos is required for Moira)
67 +fi
68 +
69  # Hesiod support
70  AC_MSG_CHECKING(for Hesiod)
71  AC_ARG_WITH(hesiod,
72 @@ -176,23 +181,6 @@
73      MR_DEFINE(HAVE_HESIOD)
74  fi
75  
76 -# Zephyr support
77 -AC_MSG_CHECKING(for Zephyr)
78 -AC_ARG_WITH(zephyr,
79 -    [  --with-zephyr=PREFIX    Specify location of Zephyr],
80 -    [zephyr="$withval"], [zephyr=no])
81 -AC_MSG_RESULT($zephyr)
82 -if test "$zephyr" != no; then
83 -    if test "$zephyr" != yes; then
84 -       MR_INCLUDE($zephyr/include)
85 -       MR_LIBS($zephyr/lib)
86 -    fi
87 -    AC_CHECK_LIB(zephyr, ZInitialize, :,
88 -                [AC_MSG_ERROR(Zephyr library not found)],
89 -                $LIBPATH $KRB4_LIBS -lcom_err)
90 -    MR_DEFINE(HAVE_ZEPHYR)
91 -fi
92 -
93  # RSAREF support (default: build util/rsaref if present)
94  AC_MSG_CHECKING(for RSAREF)
95  AC_ARG_WITH(rsaref,
96 @@ -449,7 +437,7 @@
97  MR_INCLUDE('$(BUILDTOP)/db')
98  MR_INCLUDE('$(srcdir)')
99  LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH"
100 -KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS"
101 +KLIBS="$KRB4_LIBS -lcom_err -lhesiod $LIBS"
102  LIBS="-lmoira $KLIBS"
103  AC_SUBST(KLIBS)
104  
Note: See TracBrowser for help on using the browser.