| 1 |
maksbotan 11/10/28 17:25:25 |
| 2 |
|
| 3 |
Added: autoconf_fix-1.3.2.patch |
| 4 |
Log: |
| 5 |
Bump to 1.3.2, thanks to slepnoga |
| 6 |
|
| 7 |
(Portage version: 2.1.10.26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-misc/hivex/files/autoconf_fix-1.3.2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/autoconf_fix-1.3.2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/autoconf_fix-1.3.2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: autoconf_fix-1.3.2.patch |
| 16 |
=================================================================== |
| 17 |
--- configure.ac.orig 2011-08-15 22:29:28.309745342 +0300 |
| 18 |
+++ configure.ac 2011-08-15 22:34:54.324549151 +0300 |
| 19 |
@@ -170,11 +170,18 @@ |
| 20 |
AC_SUBST([LIBXML2_CFLAGS]) |
| 21 |
AC_SUBST([LIBXML2_LIBS]) |
| 22 |
|
| 23 |
+ |
| 24 |
+dnl //////////////////////////////////////////////////////////////////////////// |
| 25 |
dnl Check for OCaml (optional, for OCaml bindings). |
| 26 |
+ |
| 27 |
+AC_ARG_ENABLE([ocaml], |
| 28 |
+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) |
| 29 |
+ |
| 30 |
+ |
| 31 |
AC_PROG_OCAML |
| 32 |
AC_PROG_FINDLIB |
| 33 |
AM_CONDITIONAL([HAVE_OCAML], |
| 34 |
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) |
| 35 |
+ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]) |
| 36 |
AM_CONDITIONAL([HAVE_OCAMLOPT], |
| 37 |
[test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) |
| 38 |
|
| 39 |
@@ -207,6 +214,8 @@ |
| 40 |
rm -f conftest conftest.* conftest_ml.* |
| 41 |
fi |
| 42 |
|
| 43 |
+dnl /////////////////////////////////////////////////////////////////////////////////////// |
| 44 |
+ |
| 45 |
dnl Check for Perl (optional, for Perl bindings). |
| 46 |
dnl XXX This isn't quite right, we should check for Perl devel library. |
| 47 |
AC_CHECK_PROG([PERL],[perl],[perl],[no]) |
| 48 |
@@ -214,21 +223,35 @@ |
| 49 |
dnl Check for Perl modules that must be present to compile and |
| 50 |
dnl test the Perl bindings. |
| 51 |
missing_perl_modules=no |
| 52 |
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do |
| 53 |
- AC_MSG_CHECKING([for $pm]) |
| 54 |
- if ! perl -M$pm -e1 >/dev/null 2>&1; then |
| 55 |
- AC_MSG_RESULT([no]) |
| 56 |
- missing_perl_modules=yes |
| 57 |
- else |
| 58 |
- AC_MSG_RESULT([yes]) |
| 59 |
- fi |
| 60 |
-done |
| 61 |
-if test "x$missing_perl_modules" = "xyes"; then |
| 62 |
- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) |
| 63 |
-fi |
| 64 |
+ |
| 65 |
+AC_ARG_ENABLE([perl], |
| 66 |
+ AS_HELP_STRING([--with-perl],[build Perl binding])) |
| 67 |
+ |
| 68 |
+ |
| 69 |
+PERL= |
| 70 |
+AS_IF([test "x$enable_perl" != "xno" ],[ |
| 71 |
+ AC_CHECK_PROG([PERL],[perl],[yes],[no]) |
| 72 |
+ |
| 73 |
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do |
| 74 |
+ AC_MSG_CHECKING([for $pm]) |
| 75 |
+ if ! perl -M$pm -e1 >/dev/null 2>&1; then |
| 76 |
+ AC_MSG_RESULT([no]) |
| 77 |
+ missing_perl_modules=yes |
| 78 |
+ else |
| 79 |
+ AC_MSG_RESULT([yes]) |
| 80 |
+ fi |
| 81 |
+ done |
| 82 |
+ |
| 83 |
+ AS_IF([test "x$missing_perl_modules" = "xyes"], |
| 84 |
+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], |
| 85 |
+ ) |
| 86 |
+]) |
| 87 |
+ |
| 88 |
|
| 89 |
AM_CONDITIONAL([HAVE_PERL], |
| 90 |
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) |
| 91 |
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) |
| 92 |
+ |
| 93 |
+dnl ////////////////////////////////////////////////////////////////////////////////////////////////// |
| 94 |
|
| 95 |
dnl Check for Python (optional, for Python bindings). |
| 96 |
AC_CHECK_PROG([PYTHON],[python],[python],[no]) |
| 97 |
@@ -266,15 +289,21 @@ |
| 98 |
AC_SUBST(PYTHON_INCLUDEDIR) |
| 99 |
AC_SUBST(PYTHON_SITE_PACKAGES) |
| 100 |
|
| 101 |
+AC_ARG_ENABLE([python], |
| 102 |
+ AS_HELP_STRING([--with-python],[build Python binding])) |
| 103 |
+ |
| 104 |
AM_CONDITIONAL([HAVE_PYTHON], |
| 105 |
- [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"]) |
| 106 |
+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) |
| 107 |
|
| 108 |
dnl Check for Ruby and rake (optional, for Ruby bindings). |
| 109 |
AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) |
| 110 |
AC_CHECK_PROG([RAKE],[rake],[rake],[no]) |
| 111 |
|
| 112 |
+AC_ARG_ENABLE([ruby], |
| 113 |
+ AS_HELP_STRING([--with-ruby],[build Ruby binding])) |
| 114 |
+ |
| 115 |
AM_CONDITIONAL([HAVE_RUBY], |
| 116 |
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) |
| 117 |
+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"]) |
| 118 |
|
| 119 |
dnl dnl Check for Java. |
| 120 |
dnl AC_ARG_WITH(java_home, |
Archives