[SVN-NetXMS] revision 3315

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3315
Author:alk

Date:2008-06-18 14:11:48 +0300 (Wed, 18 Jun 2008)

Comment:- makefile for sqlite driver fixed
- executable flag set on 'reconf'

Changes
U trunk/configure.ac
_U trunk/reconf
U trunk/src/server/dbdrv/sqlite/Makefile.am

Diff
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-06-17 23:37:04 UTC (rev 3314)
+++ trunk/configure.ac 2008-06-18 11:11:48 UTC (rev 3315)
@@ -120,11 +120,6 @@
 AC_ARG_WITH(sqlite,
 [AS_HELP_STRING(--with-sqlite,build SQLite database driver)],
 [ if test "x$withval" != "xno" ; then
- if test "x$withval" != "x" && test "x$withval" != "xyes" ; then
- LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- LDFLAGS="$LDFLAGS -L${withval}/lib"
- CPPFLAGS="$CPPFLAGS -I${withval}/include"
- fi
         COMPONENTS="$COMPONENTS sqlite"
         DBDRIVER_SELECTED="yes"
 fi ])
@@ -1332,19 +1327,6 @@
 
 
 #--------------------------------------------------------------------
-# SQLite
-#--------------------------------------------------------------------
-
-check_substr "$COMPONENTS" "sqlite"
-if test $? = 0; then
- AC_CHECK_HEADER(sqlite3.h,,AC_MSG_ERROR([*** Cannot find sqlite3.h - check your SQLite installation ***]))
- AC_CHECK_LIB(rt, fdatasync)
- AC_CHECK_LIB(sqlite3, sqlite3_open, [],
- [AC_MSG_ERROR(libsqlite3 is required for SQLite support)])
-fi
-
-
-#--------------------------------------------------------------------
 # nxhttpd
 #--------------------------------------------------------------------
 

Property changes on: trunk/reconf
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/src/server/dbdrv/sqlite/Makefile.am
===================================================================
--- trunk/src/server/dbdrv/sqlite/Makefile.am 2008-06-17 23:37:04 UTC (rev 3314)
+++ trunk/src/server/dbdrv/sqlite/Makefile.am 2008-06-18 11:11:48 UTC (rev 3315)
@@ -1,12 +1,12 @@
 INCLUDES=-I_at_top_srcdir@/include -I_at_top_srcdir@/src/server/include
 
 lib_LTLIBRARIES = libnxddr_sqlite.la
-libnxddr_sqlite_la_SOURCES = sqlite.cpp
+libnxddr_sqlite_la_SOURCES = sqlite.cpp sqlite3.c
 libnxddr_sqlite_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION) ../../../libnetxms/libnetxms.la
 
 EXTRA_DIST = \
         sqlite.dsp sqlite.dsw \
- sqlitedrv.h
+ sqlitedrv.h sqlite3ext.h sqlite3.h
 
 install-exec-hook:
         if test "x`uname -s`" = "xAIX" ; then $(AR) x $(libdir)/libnxddr_sqlite.a $(libdir)/libnxddr_sqlite.so.0 ; fi
Received on Wed Jun 18 2008 - 14:11:48 EEST