You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic...

103 lines
3.3 KiB

# HG changeset patch
# User Andreis Vinogradovs <spamslepnoga@inbox.ru>
# Date 1325421041 -7200
# Node ID ba14909c0a95bf9879e6df25d8128d1cf9a75252
# Parent c9bc634a526984160a40b70f71895de0a855f4c0
configure_ac_automagic.patch
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,10 @@
if test -f /etc/arch-release; then
DISTRO=ARCHLINUX
fi
+ dnl Slepnoga for Gentoo
+ if test -f /etc/gentoo-release; then
+ DISTRO=GENTOO
+ fi
AC_MSG_RESULT([$DISTRO])
AC_SUBST([DISTRO])
fi
@@ -461,7 +465,7 @@
AC_DEFINE([HAVE_LIBMAGIC],[1],[libmagic found at compile time.])
], [])
],
- [AC_MSG_WARN([libmagic not found, some core features will be disabled])])
+ [AC_MSG_FAILURE([libmagic not found, some core features will be disabled])])
dnl Check for PCRE (highly recommended)
PKG_CHECK_MODULES([PCRE], [libpcre],
@@ -469,7 +473,7 @@
AC_SUBST([PCRE_LIBS])
AC_DEFINE([HAVE_PCRE],[1],[PCRE found at compile time.])
],
- [AC_MSG_WARN([PCRE not found, some core features will be disabled])])
+ [AC_MSG_FAILURE([PCRE not found, some core features will be disabled])])
dnl libvirt (highly recommended)
PKG_CHECK_MODULES([LIBVIRT], [libvirt],
@@ -486,7 +490,7 @@
AC_SUBST([LIBXML2_LIBS])
AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
],
- [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
+ [AC_MSG_FAILURE([libxml2 not found, some core features will be disabled])])
AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
dnl hivex library (highly recommended)
@@ -654,13 +658,13 @@
AM_CONDITIONAL([HAVE_RUBY],
[test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-dnl Check for Java.
-AC_ARG_WITH(java_home,
- [AS_HELP_STRING([--with-java-home],
- [specify path to JDK directory @<:@default=check@:>@])],
- [],
- [with_java_home=check])
+AC_ARG_ENABLE([java],
+ AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
+ [enable_java=no],
+ [enable_java=yes])
+AS_IF([test "x$enable_java" = "xyes"],
+ [
if test "x$with_java_home" != "xno"; then
if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
then
@@ -756,7 +760,6 @@
fi
fi
AC_MSG_RESULT([$JNI_CFLAGS])
-
dnl Need extra version flag?
AC_MSG_CHECKING([extra javac flags])
JAVAC_FLAGS=
@@ -791,8 +794,8 @@
AC_SUBST(JAR_INSTALL_DIR)
AC_SUBST(JNI_INSTALL_DIR)
AC_SUBST(JNI_VERSION_INFO)
-
-AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
+])
+AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
dnl Check for Haskell (GHC).
GHC=no
@@ -849,8 +852,12 @@
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-AC_SUBST([LIBTOOL])
+dnl ha-ha, criocamera :) - gentoo kill la files in other way's
+dnlLIBTOOL='$(SHELL) $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
+dnl haha, are stub
+dnl AC_PROG_LIBTOOL
+dnl AC_SUBST([LIBTOOL])
+LT_INIT
dnl Run in subdirs.
if test "x$enable_daemon" = "xyes"; then