Context Navigation

configure.ac

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

Property svn:mergeinfo changed

Property svn:mergeinfo changed

/branches/pap/psModules (added)	merged: 23578-23579,23620,23656,23719,23731
/trunk/psModules	merged: 23600,23623,23625-23626,23688,23692,23740,23746,23748,23751,23753,23761,23773,23775,23780,23788-23789,23791-23792,23794,23819,23826-23827,23832,23837,23839,23849-23851,23937,23944,23955-23956,23960-23962,23973,23975,23989-23990,24003,24007,24021-24022,24025,24034,24048,24052,24058,24066,24093-24096,24113,24174,24181,24206,24212

-              r14187
+              r24244
 echo "PSMODULES_CFLAGS: $PSMODULES_CFLAGS"
 echo "PSMODULE_LIBS: $PSMODULES_LIBS"
+IPP_VERSION(PSMODULES)
+AM_CONDITIONAL([HAVE_SVNVERSION], [test "x$SVNVERSION" != x])
+AM_CONDITIONAL([HAVE_SVN], [test "x$SVN" != x])
 dnl ------- enable -Werror after all of the probes have run ---------

Note: See TracChangeset for help on using the changeset viewer.