gegl r2577 - in branches/branch2_zhangjb: . docs operations

[zhangjb svn gnome org]

Author: zhangjb
Date: Tue Aug 12 01:49:26 2008
New Revision: 2577
URL: http://svn.gnome.org/viewvc/gegl?rev=2577&view=rev

Log:


Modified:
   branches/branch2_zhangjb/ChangeLog
   branches/branch2_zhangjb/configure.ac
   branches/branch2_zhangjb/docs/ChangeLog
   branches/branch2_zhangjb/docs/frequency-domain-operation-document.txt
   branches/branch2_zhangjb/operations/Makefile.am

Modified: branches/branch2_zhangjb/configure.ac
==============================================================================
--- branches/branch2_zhangjb/configure.ac	(original)
+++ branches/branch2_zhangjb/configure.ac	Tue Aug 12 01:49:26 2008
@@ -814,9 +814,17 @@
 
 dnl disable build of workshop operations.
 AC_ARG_ENABLE([workshop],
-              [  --enable-workshop       enable build of workshop operations (default=no)],,
+              [  --enable-workshop       allow use of GPL code, the frequency domain operations are build \
+	        and gegl will be under GPL (default=no)],,
               enable_workshop="no")
 
+AM_CONDITIONAL(ENABLE_GPL, test "x$enable_gpl" == "xyes")
+
+dnl disable gpl codes.
+AC_ARG_ENABLE([gpl],
+              [  --enable-gpl       enable build of gpl licence codes (frequency domain operations) (default=no)],,
+              enable_gpl="no")
+
 AM_CONDITIONAL(ENABLE_WORKSHOP, test "x$enable_workshop" == "xyes")
 
 
@@ -864,6 +872,7 @@
   Build workshop: $enable_workshop
   Build website:  $have_asciidoc
   SIMD:           sse:$enable_sse mmx:$enable_mmx
+  GPL:		  $enable_gpl
 
 Optional dependencies:
   GTK+:           $have_gtk

Modified: branches/branch2_zhangjb/docs/frequency-domain-operation-document.txt
==============================================================================
--- branches/branch2_zhangjb/docs/frequency-domain-operation-document.txt	(original)
+++ branches/branch2_zhangjb/docs/frequency-domain-operation-document.txt	Tue Aug 12 01:49:26 2008
@@ -1,3 +1,7 @@
+0. Enable frequency-domain operation.
+Since frequency domain operation used GLP code, so to use these operations, you should type ./configure --enable-gpl
+to build the lib, and the gegl will be under GPL then.
+
 1. Write your first program using frequency-domain operations
 
 The "dft-forward" operation transforms the time-domain image into frenquency-domain, 
@@ -107,7 +111,6 @@
 this is no need to care about because all this has been done in the freq_multiply() function.
 Then according to the parameter "flag", corresponding component are multiplied by the fitler.
 
-
 4. Design your own filter.
 Although we have provided many filters, but we can not provide all. The 
 operation "freq-general-filter" is for those users who want to use their own 

Modified: branches/branch2_zhangjb/operations/Makefile.am
==============================================================================
--- branches/branch2_zhangjb/operations/Makefile.am	(original)
+++ branches/branch2_zhangjb/operations/Makefile.am	Tue Aug 12 01:49:26 2008
@@ -3,13 +3,16 @@
 	core		\
 	common		\
 	external	\
-	frequency	\
 	generated
 
 if ENABLE_WORKSHOP
 SUBDIRS+= workshop
 endif
 
+if ENABLE_GPL
+SUBDIRS+= frequency
+endif
+
 EXTRA_DIST= \
 	Makefile-operations.am	\
 	Makefile-common.am