[SVN-NetXMS] revision 3310

* { 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:3310
Author:victor

Date:2008-06-17 14:33:16 +0300 (Tue, 17 Jun 2008)

Comment:Add possibility to include private sources into build

Changes
U trunk/configure.ac
U trunk/reconf
U trunk/tools/Makefile.am
A trunk/tools/patch_config.status.pl

Diff
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-06-16 22:20:09 UTC (rev 3309)
+++ trunk/configure.ac 2008-06-17 11:33:16 UTC (rev 3310)
@@ -111,6 +111,12 @@
         CPPFLAGS="$CPPFLAGS -DNETXMS_MEMORY_DEBUG"
 ])
 
+AC_ARG_WITH(private,
+[AS_HELP_STRING(--with-private,include private sources into build)],
+[
+ COMPONENTS="$COMPONENTS private"
+])
+
 AC_ARG_WITH(sqlite,
 [AS_HELP_STRING(--with-sqlite,build SQLite database driver)],
 [ if test "x$withval" != "xno" ; then
@@ -406,7 +412,12 @@
         DB_DRIVERS="$DB_DRIVERS oracle"
 fi
 
+check_substr "$COMPONENTS" "private"
+if test $? = 0; then
+ MODULES="$MODULES private"
+fi
 
+
 #--------------------------------------------------------------------
 # Check for programs
 #--------------------------------------------------------------------
@@ -1539,6 +1550,11 @@
         tools/Makefile
 ])
 
+if test -d src/private; then
+ PRIVATE=`cat src/private/configure.files`
+ AC_CONFIG_FILES([$PRIVATE])
+fi
+
 AC_OUTPUT
 
 echo "Updating libtool"
@@ -1549,6 +1565,11 @@
         sed "s,hardcode_libdir_flag_spec_ld=,#hardcode_libdir_flag_spec_ld=,g" < ./libtool > libtool.new && mv libtool.new libtool && chmod +x ./libtool
 fi
 
+# Patch config.status
+if test -d src/private; then
+ PRIVATE=`cat src/private/configure.files`
+ $PERL tools/patch_config.status.pl $PRIVATE < config.status > config.status.temp && mv config.status.temp config.status && chmod +x ./config.status
+fi
 
 #--------------------------------------------------------------------
 # Print summary

Modified: trunk/reconf
===================================================================
--- trunk/reconf 2008-06-16 22:20:09 UTC (rev 3309)
+++ trunk/reconf 2008-06-17 11:33:16 UTC (rev 3310)
@@ -34,5 +34,14 @@
 $AUTOHEADER &&
 echo "- automake." &&
 $AUTOMAKE -a &&
-chmod 755 configure &&
+chmod 755 configure
+
+if test -d src/private; then
+ FILES=`cat src/private/configure.files`
+ for file in $FILES; do
+ echo "Processing $file"
+ $AUTOMAKE $file
+ done
+fi
+
 exit $?

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am 2008-06-16 22:20:09 UTC (rev 3309)
+++ trunk/tools/Makefile.am 2008-06-17 11:33:16 UTC (rev 3310)
@@ -14,6 +14,7 @@
         create_ssa_list.sh \
         mc.pl \
         nwmkimp.pl \
+ patch_config.status.pl \
         sharIt \
         stub.sh \
         update_xrc.pl

Added: trunk/tools/patch_config.status.pl
===================================================================
--- trunk/tools/patch_config.status.pl (rev 0)
+++ trunk/tools/patch_config.status.pl 2008-06-17 11:33:16 UTC (rev 3310)
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+while(<STDIN>)
+{
+ chomp;
+ $line = $_;
+
+ if ($line =~ /\"\$PRIVATE\"\) CONFIG_FILES/)
+ {
+ for($i = 0; $i <= $#ARGV; $i++)
+ {
+ print "\t\"" . $ARGV[$i]. "\") CONFIG_FILES=\"\$CONFIG_FILES " . $ARGV[$i] . "\" ;;\n";
+ }
+ $line = "";
+ }
+
+ if ($line ne "")
+ {
+ print "$line\n";
+ }
+}

Property changes on: trunk/tools/patch_config.status.pl
___________________________________________________________________
Added: svn:executable
   + *
Received on Tue Jun 17 2008 - 14:33:17 EEST