Fixxor AC_CONFIG_MACRO_DIR conflicts with ACLOCAL_AMFLAGS

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1135 32389bae-6d03-0410-99cf-db05cde120eb

3 files changed, 38 insertions, 10 deletions

diff --git a/sci-libs/opencv/ChangeLog b/sci-libs/opencv/ChangeLog
index 8d8edd982..dcb293ce8 100644
--- a/sci-libs/opencv/ChangeLog
+++ b/sci-libs/opencv/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
+  ChangeLog:
+  Fixxor AC_CONFIG_MACRO_DIR conflicts with ACLOCAL_AMFLAGS
+
   08 Jun 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
   ChangeLog:
   Initial import, bug #70506
diff --git a/sci-libs/opencv/Manifest b/sci-libs/opencv/Manifest
index 373624c04..41eacc86e 100644
--- a/sci-libs/opencv/Manifest
+++ b/sci-libs/opencv/Manifest
@@ -1,9 +1,9 @@
-AUX opencv-1.0.0-automagicdependencies.patch 15921 RMD160 3f057b3970fdf589de0a44342b3038d10966149b SHA1 64ccf3326a5c2015c217373c84b834e2e1b24ed5 SHA256 e86c08eca7dcc0ab4757bdc5e117803ba2caa35fb57d2929870aa71b7f561b3f
+AUX opencv-1.0.0-automagicdependencies.patch 16847 RMD160 2c2a0a24b2f81ac67cab19fb5b9e2bbca90012f4 SHA1 0f094ed964003253f3b78423ff0a5483371aa0a2 SHA256 4ec70684d2c138891a04dc931df6a050a33b10744f2acdd998f02b9370edeeaf
 AUX opencv-1.0.0-cvcapffmpeg.patch 2189 RMD160 5865726b2334816bc92975657f40764700239e31 SHA1 ca60a2d270199c114771883ec14c431e03961e3d SHA256 ec499a152e17789ebe4054b5bb04da9933a54ee4e3ed8fdbd1ccc2fa64736d86
 AUX opencv-1.0.0-enableuseflags.patch 5107 RMD160 fb23cfe9ff83be4196f85448d462409e29797bf3 SHA1 9ad3158e2e5b0f84b13269bf9944b3753baab1c9 SHA256 af59706ebe8a4529366cfb335e4d8a2e17f9ab07127455a624df54876130e153
 AUX opencv-1.0.0-fixpythonmultilib.patch 423 RMD160 a3cdb0c1a25b4f8ab8447ac6e4776ade2daad458 SHA1 f3d43b10b5cdfd77ce50cfea7cf9c1431479c5de SHA256 317750f75417b5e2434c09f8244d347c7340eebe721579c7f39639b526af61fb
 AUX opencv-1.0.0-havepngexrdefs.patch 1869 RMD160 477e487f34c9ebdc8e7666d2d6c7369a44bde7ed SHA1 9c7df4269887a5d5d3e2a4b17840f168098224f2 SHA256 5b077c9958d1699ec8b1d1c952f90d2830d4a4f9b0fe7a01a21747a6280f12d6
 DIST opencv-1.0.0.tar.gz 11146334 RMD160 f041798ea63101b90e945957e0d0ad3f7497dcd4 SHA1 c7dd500703b0060cedfa049fcb33de0846e631fb SHA256 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
 EBUILD opencv-1.0.0.ebuild 2224 RMD160 fc28284cbc3cae09872363c27db74f62f971a61e SHA1 b118299ae0602e06f2319d127844580db7f6a87e SHA256 7b390554d3bb087e905432c679e7474f00133046081c5d81a41271c80029b9c7
-MISC ChangeLog 228 RMD160 18374ff78d7af305eea980fc44ea5be0e42f98ab SHA1 56292eaf093305f6814998010e6f6c5adb271846 SHA256 275e019bb73c5ef66d0bcb491dc02c30074ce62e33a5bd2ccf71033e1ab4bcbd
+MISC ChangeLog 371 RMD160 db8f0985b48ec45ed1b29b8d8047e96af4caefee SHA1 0d0e255d471e036cda3e923b80b945a7f88be9a7 SHA256 f14ec01b76506f996ee51be820169eb73cb280e9b00cac08cc4f3812a9bfc8ea
 MISC metadata.xml 691 RMD160 759e574f771a8d57512b84db50a97acec7ba6a78 SHA1 9faa300f7489783893ac6684198d75c90600ae31 SHA256 d79926876ff2fdc9c9ef5a8660fee8959d05b9605db49651b2cd4fb360fd3696
diff --git a/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch b/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
index cd267a773..bcc14aaed 100644
--- a/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
+++ b/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
@@ -1,6 +1,14 @@
 --- opencv-1.0.0-orig/configure.in	2006-11-03 10:54:33.000000000 -0500
-+++ opencv-1.0.0/configure.in	2008-06-07 09:49:34.000000000 -0400
-@@ -81,13 +81,14 @@
++++ opencv-1.0.0/configure.in	2008-06-12 10:36:29.000000000 -0400
+@@ -20,7 +20,6 @@
+ AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net])
+ AC_CONFIG_SRCDIR([opencv.pc.in])
+ AC_CONFIG_AUX_DIR([autotools])
+-AC_CONFIG_MACRO_DIR([autotools/aclocal])
+ 
+ # put CVS revision of this configure.in into the resulting configure script
+ AC_REVISION($Revision: 1.39 $)
+@@ -81,15 +80,22 @@
  AC_ARG_ENABLE([debug],
                [AS_HELP_STRING([--enable-debug],[build debug version without optimization])],
                [debug=$enableval], 
@@ -16,8 +24,16 @@
 +              [enable_apps="no"])
  AM_CONDITIONAL([BUILD_APPS], [test x"$enable_apps" = x"yes"])
  
++AC_ARG_ENABLE([samples],
++              [AS_HELP_STRING([--enable-samples],[install sample source code])],
++              [enable_samples=$enableval],
++              [enable_samples="no"])
++AM_CONDITIONAL([INSTALL_SAMPLES], [test x"$enable_samples" = x"yes"])
++
  
-@@ -101,55 +102,64 @@
+ # the following checks reflect the dependencies of OpenCV on other
+ # libraries that do the actual work for video I/O or windowing 
+@@ -101,55 +107,64 @@
  AC_ARG_WITH([swig], 
              [AS_HELP_STRING([--with-swig],[use swig wrapper generator])],
              [with_swig=$withval],
@@ -91,7 +107,7 @@
  
  
  ######################################################################
-@@ -340,7 +350,7 @@
+@@ -340,7 +355,7 @@
  
  # if QuickTime is present, it will override everything else,
  # (unless '--without-quicktime' was given)
@@ -100,7 +116,7 @@
  
      # check other ./configure flags
      if test x"$with_ffmpeg" = "xyes"; then
-@@ -460,92 +470,47 @@
+@@ -460,92 +475,47 @@
  
  # IEEE1394 / FireWire video video i/o with libdc1394, libraw1394
  # (can be managed by QuickTime as well)
@@ -224,7 +240,7 @@
  fi
  AM_CONDITIONAL([BUILD_V4L], [test x"$have_v4l1or2" = "xyes"])
  
-@@ -558,78 +523,86 @@
+@@ -558,78 +528,86 @@
  
  AC_SUBST(IMAGELIBS)
  
@@ -383,7 +399,7 @@
  
  # Restore original LIBS settings...
  LIBS="$SAVELIBS"
-@@ -690,7 +663,7 @@
+@@ -690,7 +668,7 @@
  AM_CONDITIONAL([BUILD_PYTHON_WRAPPERS], [test x"$have_python" = "xyes"])
  
  # check for swig itself
@@ -392,7 +408,7 @@
  if test x"$with_swig" = "xyes"; then
      AC_MSG_NOTICE([Checking for SWIG])
  
-@@ -807,12 +780,12 @@
+@@ -807,12 +785,12 @@
      Use gthread:              ${have_gthread}
      
      Image I/O ---------------------
@@ -411,3 +427,11 @@
      
      Video I/O ---------------------
      Use QuickTime / Mac OS X: ${have_quicktime}
+@@ -828,6 +806,7 @@
+ 
+ Additional build settings ============================================
+     Build demo apps           ${enable_apps}
++    Install source snippets   ${enable_samples}
+ 
+ Now run make ...
+ ])