rpms/gyachi/EL-4 configure.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Rahul Sundaram (sundaram) fedora-extras-commits at redhat.com
Wed Feb 6 20:51:14 UTC 2008


Author: sundaram

Update of /cvs/pkgs/rpms/gyachi/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23322

Modified Files:
	.cvsignore sources 
Added Files:
	configure.patch 
Log Message:


configure.patch:

--- NEW FILE configure.patch ---
diff -ru -x '*~' -N gyachi-1.1.0.cvs/configure.ac.tmpl gyachi-1.1.0.patch/configure.ac.tmpl
--- gyachi-1.1.0.cvs/configure.ac.tmpl	2007-11-03 21:12:54.000000000 +0800
+++ gyachi-1.1.0.patch/configure.ac.tmpl	2008-02-05 13:36:10.000000000 +0800
@@ -52,6 +52,11 @@
 AC_ARG_ENABLE(esd,
   [  --enable-esd            use ESD instead of ALSA for sounds])
 
+AC_ARG_ENABLE(wine,
+  [  --disable-wine          do not compile/generate wine related functionality (voice)])
+
+AM_CONDITIONAL([WINE_SUPPORT], [test "$enable_wine" != "no"])
+
 AC_DEFINE([USE_GTK2], 1, [Define if only GTK 2 is supported])
 AC_SUBST(PACKAGE_DOC_DIR, "${acl_final_prefix}/share/doc/${PACKAGE}-${VERSION}")
 AC_DEFINE_UNQUOTED([PACKAGE_DOC_DIR], "${acl_final_prefix}/share/doc/${PACKAGE}-${VERSION}", [ Location of package-specific documentation ])
@@ -61,9 +66,11 @@
 AC_DEFINE_UNQUOTED([EXPANDED_LIBEXECDIR], "${acl_final_prefix}/lib/${PACKAGE}", [ ])
 
 dnl Required for gyachivoice
-AC_DEFINE([USE_WIN32DLL], [1], [ Define if Win32 DLL should be used ])
-AC_DEFINE_UNQUOTED([WIN32_PATH], "/usr/lib/win32", [ Define for finding Win32 libraries ])
-AC_DEFINE([__WINE__], [1], [ ])
+if test "$enable_wine" != "no"; then
+    AC_DEFINE([USE_WIN32DLL], [1], [ Define if Win32 DLL should be used ])
+    AC_DEFINE_UNQUOTED([WIN32_PATH], "/usr/lib/win32", [ Define for finding Win32 libraries ])
+    AC_DEFINE([__WINE__], [1], [ ])
+fi
 AC_DEFINE([MPLAYER], [1], [ Define if MPlayer should be used ])
 AC_DEFINE([dbg_printf], [__vprintf], [ ])
 AC_DEFINE([TRACE], [__vprintf] ,[ ])
diff -ru -x '*~' -N gyachi-1.1.0.cvs/Makefile.am gyachi-1.1.0.patch/Makefile.am
--- gyachi-1.1.0.cvs/Makefile.am	2007-11-03 21:12:54.000000000 +0800
+++ gyachi-1.1.0.patch/Makefile.am	2008-02-05 13:27:59.000000000 +0800
@@ -1,5 +1,9 @@
 
-SUBDIRS = intl po gyvoice client webcam plugins
+
+if WINE_SUPPORT
+    GYVOICE = gyvoice
+endif
+SUBDIRS = intl po $(GYVOICE) client webcam plugins
 
 util_DATA = gyachi.desktop
 utildir = $(datadir)/applications
@@ -72,7 +76,7 @@
 	    fi \
 	  done \
 	fi
-	
+
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)
 	rm -rf $(DESTDIR)$(PACKAGE_DOC_DIR)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Feb 2008 17:29:34 -0000	1.1
+++ .cvsignore	6 Feb 2008 20:50:36 -0000	1.2
@@ -0,0 +1 @@
+gyachi-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Feb 2008 17:29:34 -0000	1.1
+++ sources	6 Feb 2008 20:50:36 -0000	1.2
@@ -0,0 +1 @@
+f833c873da22fe857d9a5edd3c0e9922  gyachi-1.1.0.tar.gz




More information about the fedora-extras-commits mailing list