ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/configure.in
(Generate patch)

Comparing projects/libstatgrab/configure.in (file contents):
Revision 1.31 by tdb, Sat Oct 4 16:05:55 2003 UTC vs.
Revision 1.36 by tdb, Thu Oct 9 22:56:41 2003 UTC

# Line 6 | Line 6
6   #
7  
8   # Change these to change the package name and version
9 < AC_INIT(libstatgrab, 0.6, bugs@i-scream.org)
10 < AM_INIT_AUTOMAKE(libstatgrab, 0.6)
9 > AC_INIT(libstatgrab, 0.6.1, bugs@i-scream.org)
10 > AM_INIT_AUTOMAKE(libstatgrab, 0.6.1)
11  
12   # Revision number (automatically updated)
13   AC_REVISION($Revision$)
# Line 34 | Line 34 | AC_FUNC_MALLOC
34   AC_FUNC_REALLOC
35   AC_CHECK_FUNCS(atoll)
36  
37 + # Default needing setgid to false
38 + AM_CONDITIONAL(SETGIDBINS, false)
39 +
40   # Set things up for different OS's
41   # We define the name of the OS so the code can act accordingly
42   # We also need to add the right LDFLAGS
# Line 50 | Line 53 | solaris2.*)
53          LINKFLAGS="-lkstat"
54          ;;
55   freebsd4.*)
56 <        AC_DEFINE(FREEBSD, , [Building on FreeBSD 4.x])
56 >        AC_DEFINE(FREEBSD, , [Building on FreeBSD])
57 >        AM_CONDITIONAL(SETGIDBINS, true)
58          LINKFLAGS="-lkvm -ldevstat"
59          ;;
60 + freebsd5.*)
61 +        AC_DEFINE(FREEBSD, , [Building on FreeBSD])
62 +        AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x])
63 +        AM_CONDITIONAL(SETGIDBINS, true)
64 +        LINKFLAGS="-lkvm -ldevstat"
65 +        ;;
66   linux-gnu)
67          AC_DEFINE(LINUX, , [Building on GNU/Linux])
68          ;;
# Line 69 | Line 79 | AC_ARG_WITH([curses-prefix],
79                          SAIDARLIBS="-L${withval}/lib ${SAIDARLIBS}"
80                  fi
81                  if test -d "$withval/include"; then
82 <                        SAIDARCPPFLAGS="-I${withval}/include ${SAIRDARCPPFLAGS}"
82 >                        SAIDARCPPFLAGS="-I${withval}/include -I${withval}/include/ncurses ${SAIRDARCPPFLAGS}"
83                  fi
84          ]
85   )
# Line 122 | Line 132 | AC_ARG_ENABLE(manpages,
132                  fi
133          ]
134   )
135 +
136 + # Check if the user wants to turn off setgid binaries
137 + # (only really relevant on FreeBSD)
138 + AC_ARG_ENABLE(setgid-binaries,
139 +        [  --disable-setgid-binaries     disable binaries being setgid],
140 +        [
141 +                if test "x$enableval" = "xno" ; then
142 +                        AM_CONDITIONAL(SETGIDBINS, false)
143 +                fi
144 +        ]
145 + )
146 +
147 + # User specified pkgconfig dir
148 + AC_ARG_WITH([pkgconfig-dir],
149 +        [  --with-pkgconfig-dir=PATH     pkgconfig lib directory (PREFIX/lib/pkgconfig)],
150 +        [ PKGCONFIG_DIR=$withval ],
151 +        [ PKGCONFIG_DIR="\$(libdir)/pkgconfig" ]
152 + )
153 + AC_SUBST(PKGCONFIG_DIR)
154  
155   # The LIBS and CPPFLAGS that saidar needs
156   AC_SUBST(SAIDARLIBS)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines