rpms/qalculate-kde/devel qalculate-kde-cln120.patch,NONE,1.1

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13415

Added Files:
	qalculate-kde-cln120.patch 
Log Message:
cln-1.2.0 patch


qalculate-kde-cln120.patch:

--- NEW FILE qalculate-kde-cln120.patch ---
--- configure.in.in	2007-05-18 04:10:17.000000000 -0400
+++ configure.in.in.new	2008-02-27 15:16:54.000000000 -0500
@@ -8,12 +8,6 @@
 
 AC_LANG([C++])
 
-AC_PATH_CLN(1.1.0, [
-     	LIBS="$LIBS $CLN_LIBS"
-     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
-  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
-
 PKG_CHECK_MODULES(QALCULATE, [
 	libxml-2.0
 	glib-2.0
@@ -26,3 +20,18 @@
 CFLAGS="$CFLAGS $QALCULATE_CFLAGS"
 CPPFLAGS="$CPPFLAGS $QALCULATE_CFLAGS"
 
+PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
+                  [have_recent_cln=yes], [have_recent_cln=no])
+AC_SUBST(CLN_CPPFLAGS)
+AC_SUBST(CLN_LIBS)
+
+if test "$have_recent_cln" = "yes" ; then
+   AC_DEFINE(HAVE_RECENT_CLN,1,[Define if CLN can be used])
+else
+   AC_PATH_CLN(1.1.0, [
+  	AC_DEFINE(HAVE_LIBCLN11,1,[If CLN can be used])
+   ], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
+fi
+LIBS="$LIBS $CLN_LIBS"
+CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+
--- configure.in	2007-06-17 07:33:58.000000000 -0400
+++ configure.in.new	2008-02-27 14:48:37.000000000 -0500
@@ -73,12 +73,6 @@
 
 AC_LANG([C++])
 
-AC_PATH_CLN(1.1.0, [
-     	LIBS="$LIBS $CLN_LIBS"
-     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
-  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
-
 PKG_CHECK_MODULES(QALCULATE, [
 	libxml-2.0
 	glib-2.0
@@ -91,6 +85,21 @@
 CFLAGS="$CFLAGS $QALCULATE_CFLAGS"
 CPPFLAGS="$CPPFLAGS $QALCULATE_CFLAGS"
 
+PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
+                  [have_recent_cln=yes], [have_recent_cln=no])
+AC_SUBST(CLN_CPPFLAGS)
+AC_SUBST(CLN_LIBS)
+
+if test "$have_recent_cln" = "yes" ; then
+   AC_DEFINE(HAVE_RECENT_CLN,1,[Define if CLN can be used])
+else
+   AC_PATH_CLN(1.1.0, [
+  	AC_DEFINE(HAVE_LIBCLN11,1,[If CLN can be used])
+   ], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
+fi
+LIBS="$LIBS $CLN_LIBS"
+CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+
 KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])
--- admin/acinclude.m4.in	2007-06-17 07:33:57.000000000 -0400
+++ admin/acinclude.m4.in.new	2008-02-28 22:30:00.000000000 -0500
@@ -3231,7 +3231,6 @@
           CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
           CFLAGS="$CFLAGS -fno-reorder-blocks"
     fi
-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
     KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)