[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.8/1.8.15: configure_ac_automagic.patch disable_php_in_makefile.patch

[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.8/1.8.15: configure_ac_automagic.patch disable_php_in_makefile.patch

[Maxim Koltsov (maksbotan)]

maksbotan    11/12/11 19:34:22

  Added:                configure_ac_automagic.patch
                        disable_php_in_makefile.patch
  Log:
  Add app-emulation/libguestfs, bug 302614. Thanks to slepnoga
  
  (Portage version: 2.1.10.39/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emulation/libguestfs/files/1.8/1.8.15/configure_ac_automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.15/configure_ac_automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.15/configure_ac_automagic.patch?rev=1.1&content-type=text/plain

Index: configure_ac_automagic.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index d072e81..cf7228e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,10 @@ if test "x$enable_appliance" = "xyes"; then
     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
@@ -416,7 +420,7 @@ AC_CHECK_LIB([magic],[magic_file],
                  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],
@@ -424,7 +428,7 @@ PKG_CHECK_MODULES([PCRE], [libpcre],
          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],
@@ -441,7 +445,7 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
          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)
@@ -609,13 +613,13 @@ AS_IF([test "x$enable_ruby" != "xno"],
 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
@@ -711,7 +715,6 @@ if test "x$with_java_home" != "xno"; then
             fi
         fi
         AC_MSG_RESULT([$JNI_CFLAGS])
-
         dnl Need extra version flag?
         AC_MSG_CHECKING([extra javac flags])
         JAVAC_FLAGS=
@@ -746,8 +749,8 @@ AC_SUBST(JAVAC_FLAGS)
 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
@@ -804,8 +807,12 @@ AC_SUBST(MAX_PROC_NR)
 
 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



1.1                  app-emulation/libguestfs/files/1.8/1.8.15/disable_php_in_makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.15/disable_php_in_makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.15/disable_php_in_makefile.patch?rev=1.1&content-type=text/plain

Index: disable_php_in_makefile.patch
===================================================================
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,9 +57,12 @@
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_PHP
-SUBDIRS += php
-endif
+
+# use Gentoo way to compile/install php extension
+# due slot  system
+#if HAVE_PHP
+#SUBDIRS += php
+#endif
 
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp

[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.8/1.8.15: configure_ac_automagic.patch disable_php_in_makefile.patch

[Maxim Koltsov (maksbotan)]

maksbotan    12/06/26 16:14:42

  Removed:              configure_ac_automagic.patch
                        disable_php_in_makefile.patch
  Log:
  Bump to new versions and remove old. Fix bugs 420785, 420805, 419587, 419589, 419585, 419583. Thanks to slepnoga.
  
  (Portage version: 2.1.11.2/cvs/Linux x86_64)