mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
Thu Nov 29 17:38:00 GMT 2007 Richard W.M. Jones <rjones@redhat.com>
* configure.in: Check for C compiler first before checking for external programs. Add AC_LIBTOOL_WIN32_DLL. Add AM_PROG_CC_STDC. Add AC_C_CONST.
This commit is contained in:
parent
4a898dd491
commit
65aa3dbf6c
@ -1,3 +1,11 @@
|
|||||||
|
Thu Nov 29 17:38:00 GMT 2007 Richard W.M. Jones <rjones@redhat.com>
|
||||||
|
|
||||||
|
* configure.in: Check for C compiler first before checking for
|
||||||
|
external programs.
|
||||||
|
Add AC_LIBTOOL_WIN32_DLL.
|
||||||
|
Add AM_PROG_CC_STDC.
|
||||||
|
Add AC_C_CONST.
|
||||||
|
|
||||||
Thu Nov 29 16:19:00 GMT 2007 Richard W.M. Jones <rjones@redhat.com>
|
Thu Nov 29 16:19:00 GMT 2007 Richard W.M. Jones <rjones@redhat.com>
|
||||||
|
|
||||||
* docs/libvir.html, docs/windows.html: Updated Windows
|
* docs/libvir.html, docs/windows.html: Updated Windows
|
||||||
|
47
configure.in
47
configure.in
@ -26,34 +26,20 @@ LIBXML_REQUIRED="2.5.0"
|
|||||||
GNUTLS_REQUIRED="1.0.25"
|
GNUTLS_REQUIRED="1.0.25"
|
||||||
AVAHI_REQUIRED="0.6.0"
|
AVAHI_REQUIRED="0.6.0"
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for C compiler.
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
AM_PROG_CC_STDC
|
||||||
|
AC_C_CONST
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
AC_PROG_CPP
|
AC_PROG_CPP
|
||||||
AC_PATH_PROG(RM, rm, /bin/rm)
|
|
||||||
AC_PATH_PROG(MV, mv, /bin/mv)
|
|
||||||
AC_PATH_PROG(TAR, tar, /bin/tar)
|
|
||||||
AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
|
|
||||||
AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
|
|
||||||
|
|
||||||
dnl External programs that we can use if they are available.
|
|
||||||
dnl We will hard-code paths to these programs unless we cannot
|
|
||||||
dnl detect them, in which case we'll search for the program
|
|
||||||
dnl along the $PATH at runtime and fail if it's not there.
|
|
||||||
AC_PATH_PROG(DNSMASQ, dnsmasq, dnsmasq,
|
|
||||||
[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
|
|
||||||
AC_PATH_PROG(BRCTL, brctl, brctl,
|
|
||||||
[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
|
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],
|
|
||||||
[Location or name of the dnsmasq program])
|
|
||||||
AC_DEFINE_UNQUOTED([BRCTL],["$BRCTL"],
|
|
||||||
[Location or name of the brctl program (see bridge-utils)])
|
|
||||||
|
|
||||||
dnl Make sure we have an ANSI compiler
|
dnl Make sure we have an ANSI compiler
|
||||||
AM_C_PROTOTYPES
|
AM_C_PROTOTYPES
|
||||||
test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
|
test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
|
||||||
|
|
||||||
|
dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL)
|
||||||
|
AC_LIBTOOL_WIN32_DLL
|
||||||
|
|
||||||
AM_PROG_LIBTOOL
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
@ -78,6 +64,27 @@ if test "x$ac_cv_path_RPCGEN" != "xno"; then
|
|||||||
[$ac_cv_path_RPCGEN -t </dev/null >/dev/null 2>&1])
|
[$ac_cv_path_RPCGEN -t </dev/null >/dev/null 2>&1])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl Miscellaneous external programs.
|
||||||
|
AC_PATH_PROG(RM, rm, /bin/rm)
|
||||||
|
AC_PATH_PROG(MV, mv, /bin/mv)
|
||||||
|
AC_PATH_PROG(TAR, tar, /bin/tar)
|
||||||
|
AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
|
||||||
|
AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
|
||||||
|
|
||||||
|
dnl External programs that we can use if they are available.
|
||||||
|
dnl We will hard-code paths to these programs unless we cannot
|
||||||
|
dnl detect them, in which case we'll search for the program
|
||||||
|
dnl along the $PATH at runtime and fail if it's not there.
|
||||||
|
AC_PATH_PROG(DNSMASQ, dnsmasq, dnsmasq,
|
||||||
|
[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
|
||||||
|
AC_PATH_PROG(BRCTL, brctl, brctl,
|
||||||
|
[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
|
||||||
|
|
||||||
|
AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],
|
||||||
|
[Location or name of the dnsmasq program])
|
||||||
|
AC_DEFINE_UNQUOTED([BRCTL],["$BRCTL"],
|
||||||
|
[Location or name of the brctl program (see bridge-utils)])
|
||||||
|
|
||||||
dnl Specific dir for HTML output ?
|
dnl Specific dir for HTML output ?
|
||||||
AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
|
AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
|
||||||
[path to base html directory, default $datadir/doc/html]),
|
[path to base html directory, default $datadir/doc/html]),
|
||||||
|
Loading…
Reference in New Issue
Block a user