[pkg-xmule-commits] CVS xmule

[CVS User dleidert-guest]

Update of /cvsroot/pkg-xmule/xmule
In directory haydn:/tmp/cvs-serv24353

Modified Files:
	configure.ac 
Log Message:
Fixing some more build related issues by using dpatch. Changing debian/rules to fit these changes. Decrease size of diff.gz. Add cvs to build-depends (is it necessary? gettext only suggests it).

--- /cvsroot/pkg-xmule/xmule/configure.ac	2005/05/04 02:01:45	1.6
+++ /cvsroot/pkg-xmule/xmule/configure.ac	2005/05/14 17:00:58	1.7
@@ -1,7 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 AC_INIT([xMule],[1.10.0b],[http://www.xmule.ws/])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_SRCDIR([src/SharedFileList.h])
 AC_CONFIG_HEADER([config.h])
 CONFIG=Release
@@ -21,7 +20,7 @@
 #AC_CHECK_LIB(xrc, wxXmlInitResourceModule, [LIBS="-lxrc"], [ echo "Warning! libxrc has not been found!  Some enhanced GUI features have been disabled."])
 
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GNU_GETTEXT_VERSION(0.11.5)
 
 AM_OPTIONS_WXCONFIG
 
@@ -72,14 +71,14 @@
 
 AC_LANG_PUSH([C++])
 
-AC_CHECK_HEADER(crypto++/sha.h, have_cryptopp=yes, have_cryptopp=no)
-AC_CHECK_LIB(crypto++, main, have_cryptopp=yes, have_cryptopp=no)
+AC_CHECK_HEADER(cryptopp/sha.h, have_cryptopp=yes, have_cryptopp=no)
+AC_CHECK_LIB(cryptopp, main, have_cryptopp=yes, have_cryptopp=no)
 #AC_CHECK_LIB(crypto++, main, have_cryptopp2=yes, have_cryptopp2=no)
 
 #AC_LANG_POP([])
 
 if test x"$have_cryptopp" = x"yes"; then
-    cryp_name="crypto++";
+    cryp_name="cryptopp";
     have_crypto = 1
 fi
 
@@ -88,7 +87,7 @@
     have_crypto = 1
 fi
 
-if test $have_crypto -eq 1 ; then
+if [have_crypto -eq 1]; then
     echo "Cryp name: -$cryp_name-"
   AC_DEFINE_UNQUOTED(HAVE_CRYPTOPP, 1, [Define if you have the Crypto++ development headers and libraries.])
     if test -n "$cryptopp_prefix"; then