rpms/jd/devel jd-svn2581-libm-onig_include.patch,NONE,1.1

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18996

Added Files:
	jd-svn2581-libm-onig_include.patch 
Log Message:


jd-svn2581-libm-onig_include.patch:

--- NEW FILE jd-svn2581-libm-onig_include.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 2581)
+++ configure.in	(working copy)
@@ -124,7 +124,15 @@
 AC_CHECK_HEADERS([socket.h])
 AC_CHECK_LIB(socket,socket)
 
+dnl
+dnl math
+dnl
 
+echo "use math"
+AC_CHECK_HEADERS([math.h])
+AC_CHECK_LIB(m,sqrt)
+
+
 dnl
 dnl セッション管理
 dnl
@@ -303,17 +311,23 @@
 AC_ARG_WITH(oniguruma,[ --with-oniguruma    (enable oniguruma)],
        [ if test "$withval" != "no" ;then
                echo "use oniguruma"
-               AC_CHECK_HEADER([onigposix.h], ,[AC_MSG_ERROR([onigposix.h not found])])
-               AC_CHECK_LIB([onig],[regexec], ,[AC_MSG_ERROR([libonig.a not found])])
                AC_CHECK_PROG(ONIG_CONFIG, onig-config, onig-config)
                if test "x${ONIG_CONFIG}" == "x" ; then
                  AC_MSG_ERROR([onig-config not found])
                fi
                ONIG_CFLAGS=`onig-config --cflags`
                ONIG_LIBS=`onig-config --libs`
+               CPPFLAGS_ORIGINAL="${CPPFLAGS}"
+               LDFLAGS_ORIGINAL="${LDFLAGS}"
+               CPPFLAGS="${CPPFLAGS} ${ONIG_CFLAGS}"
+               LDFLAGS="${LDFLAGS} ${ONIG_LIBS}"
+               AC_CHECK_HEADER([onigposix.h], ,[AC_MSG_ERROR([onigposix.h not found])])
+               AC_CHECK_LIB([onig],[regexec], ,[AC_MSG_ERROR([libonig.a not found])])
                AC_DEFINE(USE_ONIG, , "use oniguruma")
                AC_SUBST(ONIG_CFLAGS)
                AC_SUBST(ONIG_LIBS)
+               CPPFLAGS="${CPPFLAGS_ORIGINAL}"
+               LDFLAGS="${LDFLAGS_ORIGINAL}"
        fi ])
 
 
Index: src/control/Makefile.am
===================================================================
--- src/control/Makefile.am	(revision 2581)
+++ src/control/Makefile.am	(working copy)
@@ -16,5 +16,5 @@
 	mousekeypref.h keypref.h mousepref.h buttonpref.h \
 	defaultconf.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/article/Makefile.am
===================================================================
--- src/article/Makefile.am	(revision 2581)
+++ src/article/Makefile.am	(working copy)
@@ -48,5 +48,5 @@
 	toolbar.h \
 	toolbarsearch.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/message/Makefile.am
===================================================================
--- src/message/Makefile.am	(revision 2581)
+++ src/message/Makefile.am	(working copy)
@@ -18,5 +18,5 @@
 	toolbar.h \
 	logmanager.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/dbtree/Makefile.am
===================================================================
--- src/dbtree/Makefile.am	(revision 2581)
+++ src/dbtree/Makefile.am	(working copy)
@@ -57,5 +57,5 @@
 	nodetreejbbs.h \
 	nodetreemachi.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/jdlib/tfidf.cpp
===================================================================
--- src/jdlib/tfidf.cpp	(revision 2581)
+++ src/jdlib/tfidf.cpp	(working copy)
@@ -10,6 +10,7 @@
 #include "global.h"
 
 #include <set>
+#include <cmath>
 
 
 //
Index: src/board/Makefile.am
===================================================================
--- src/board/Makefile.am	(revision 2581)
+++ src/board/Makefile.am	(working copy)
@@ -15,5 +15,5 @@
 	columns.h \
 	preference.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/config/Makefile.am
===================================================================
--- src/config/Makefile.am	(revision 2581)
+++ src/config/Makefile.am	(working copy)
@@ -7,5 +7,5 @@
 noinst_HEADERS = \
 	configitems.h globalconf.h defaultconf.h aboutconfig.h aboutconfigdiag.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/bbslist/Makefile.am
===================================================================
--- src/bbslist/Makefile.am	(revision 2581)
+++ src/bbslist/Makefile.am	(working copy)
@@ -24,5 +24,5 @@
 	columns.h \
 	toolbar.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 2581)
+++ src/Makefile.am	(working copy)
@@ -113,4 +113,4 @@
 	environment.h
 
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@ @GTHREAD_CFLAGS@ @GNUTLS_CFLAGS@ @OPENSSL_CFLAGS@ @GNOMEUI_CFLAGS@ @LIBSM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @GTHREAD_CFLAGS@ @GNUTLS_CFLAGS@ @OPENSSL_CFLAGS@ @GNOMEUI_CFLAGS@ @LIBSM_CFLAGS@ @ONIG_CFLAGS@