From 3be0180445eaed554bf001d59e2cfa4389f94c10 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 17 Jul 2012 15:17:09 +0200 Subject: Use __ifelse__ instead of m4_ifelse --- boost/mssql/template/Makefile.am | 2 +- boost/mssql/template/template-vc10.vcxproj | 6 +++--- boost/mssql/template/template-vc10.vcxproj.filters | 4 ++-- boost/mssql/template/template-vc9.vcproj | 4 ++-- boost/mysql/template/Makefile.am | 2 +- boost/mysql/template/template-vc10.vcxproj | 6 +++--- boost/mysql/template/template-vc10.vcxproj.filters | 4 ++-- boost/mysql/template/template-vc9.vcproj | 4 ++-- boost/oracle/template/Makefile.am | 2 +- boost/oracle/template/template-vc10.vcxproj | 6 +++--- boost/oracle/template/template-vc10.vcxproj.filters | 4 ++-- boost/oracle/template/template-vc9.vcproj | 4 ++-- boost/pgsql/template/Makefile.am | 2 +- boost/pgsql/template/template-vc10.vcxproj | 6 +++--- boost/pgsql/template/template-vc10.vcxproj.filters | 4 ++-- boost/pgsql/template/template-vc9.vcproj | 4 ++-- boost/sqlite/template/Makefile.am | 2 +- boost/sqlite/template/template-vc10.vcxproj | 6 +++--- boost/sqlite/template/template-vc10.vcxproj.filters | 4 ++-- boost/sqlite/template/template-vc9.vcproj | 4 ++-- mssql/template/Makefile.am | 2 +- mssql/template/template-vc10.vcxproj | 6 +++--- mssql/template/template-vc10.vcxproj.filters | 4 ++-- mssql/template/template-vc9.vcproj | 4 ++-- mysql/template/Makefile.am | 2 +- mysql/template/template-vc10.vcxproj | 6 +++--- mysql/template/template-vc10.vcxproj.filters | 4 ++-- mysql/template/template-vc9.vcproj | 4 ++-- oracle/template/Makefile.am | 2 +- oracle/template/template-vc10.vcxproj | 6 +++--- oracle/template/template-vc10.vcxproj.filters | 4 ++-- oracle/template/template-vc9.vcproj | 4 ++-- pgsql/template/Makefile.am | 2 +- pgsql/template/template-vc10.vcxproj | 6 +++--- pgsql/template/template-vc10.vcxproj.filters | 4 ++-- pgsql/template/template-vc9.vcproj | 4 ++-- qt/mssql/template/Makefile.am | 2 +- qt/mssql/template/template-vc10.vcxproj | 6 +++--- qt/mssql/template/template-vc10.vcxproj.filters | 4 ++-- qt/mssql/template/template-vc9.vcproj | 4 ++-- qt/mysql/template/Makefile.am | 2 +- qt/mysql/template/template-vc10.vcxproj | 6 +++--- qt/mysql/template/template-vc10.vcxproj.filters | 4 ++-- qt/mysql/template/template-vc9.vcproj | 4 ++-- qt/oracle/template/Makefile.am | 2 +- qt/oracle/template/template-vc10.vcxproj | 6 +++--- qt/oracle/template/template-vc10.vcxproj.filters | 4 ++-- qt/oracle/template/template-vc9.vcproj | 4 ++-- qt/pgsql/template/Makefile.am | 2 +- qt/pgsql/template/template-vc10.vcxproj | 6 +++--- qt/pgsql/template/template-vc10.vcxproj.filters | 4 ++-- qt/pgsql/template/template-vc9.vcproj | 4 ++-- qt/sqlite/template/Makefile.am | 2 +- qt/sqlite/template/template-vc10.vcxproj | 6 +++--- qt/sqlite/template/template-vc10.vcxproj.filters | 4 ++-- qt/sqlite/template/template-vc9.vcproj | 4 ++-- sqlite/template/Makefile.am | 2 +- sqlite/template/template-vc10.vcxproj | 6 +++--- sqlite/template/template-vc10.vcxproj.filters | 4 ++-- sqlite/template/template-vc9.vcproj | 4 ++-- 60 files changed, 120 insertions(+), 120 deletions(-) diff --git a/boost/mssql/template/Makefile.am b/boost/mssql/template/Makefile.am index f450bb0..5f194a7 100644 --- a/boost/mssql/template/Makefile.am +++ b/boost/mssql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/mssql/template/template-vc10.vcxproj b/boost/mssql/template/template-vc10.vcxproj index b1e2e37..dcb625e 100644 --- a/boost/mssql/template/template-vc10.vcxproj +++ b/boost/mssql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/mssql/template/template-vc10.vcxproj.filters b/boost/mssql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/mssql/template/template-vc10.vcxproj.filters +++ b/boost/mssql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/mssql/template/template-vc9.vcproj b/boost/mssql/template/template-vc9.vcproj index 520a143..422fbd7 100644 --- a/boost/mssql/template/template-vc9.vcproj +++ b/boost/mssql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/mysql/template/Makefile.am b/boost/mysql/template/Makefile.am index 10e80d3..c7305cc 100644 --- a/boost/mysql/template/Makefile.am +++ b/boost/mysql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/mysql/template/template-vc10.vcxproj b/boost/mysql/template/template-vc10.vcxproj index 29e53be..3137abc 100644 --- a/boost/mysql/template/template-vc10.vcxproj +++ b/boost/mysql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/mysql/template/template-vc10.vcxproj.filters b/boost/mysql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/mysql/template/template-vc10.vcxproj.filters +++ b/boost/mysql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/mysql/template/template-vc9.vcproj b/boost/mysql/template/template-vc9.vcproj index 99551c1..b60c7e2 100644 --- a/boost/mysql/template/template-vc9.vcproj +++ b/boost/mysql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/oracle/template/Makefile.am b/boost/oracle/template/Makefile.am index 9853f57..3eec093 100644 --- a/boost/oracle/template/Makefile.am +++ b/boost/oracle/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/oracle/template/template-vc10.vcxproj b/boost/oracle/template/template-vc10.vcxproj index 8aa5256..0c93020 100644 --- a/boost/oracle/template/template-vc10.vcxproj +++ b/boost/oracle/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/oracle/template/template-vc10.vcxproj.filters b/boost/oracle/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/oracle/template/template-vc10.vcxproj.filters +++ b/boost/oracle/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/oracle/template/template-vc9.vcproj b/boost/oracle/template/template-vc9.vcproj index 2a7448a..a3061ee 100644 --- a/boost/oracle/template/template-vc9.vcproj +++ b/boost/oracle/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/pgsql/template/Makefile.am b/boost/pgsql/template/Makefile.am index ec9e43b..24a0206 100644 --- a/boost/pgsql/template/Makefile.am +++ b/boost/pgsql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/pgsql/template/template-vc10.vcxproj b/boost/pgsql/template/template-vc10.vcxproj index 9f41ede..7bc0243 100644 --- a/boost/pgsql/template/template-vc10.vcxproj +++ b/boost/pgsql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/pgsql/template/template-vc10.vcxproj.filters b/boost/pgsql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/pgsql/template/template-vc10.vcxproj.filters +++ b/boost/pgsql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/pgsql/template/template-vc9.vcproj b/boost/pgsql/template/template-vc9.vcproj index 34a8582..db49496 100644 --- a/boost/pgsql/template/template-vc9.vcproj +++ b/boost/pgsql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/sqlite/template/Makefile.am b/boost/sqlite/template/Makefile.am index 0168a12..ba7b102 100644 --- a/boost/sqlite/template/Makefile.am +++ b/boost/sqlite/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/sqlite/template/template-vc10.vcxproj b/boost/sqlite/template/template-vc10.vcxproj index 5224c7f..f94df08 100644 --- a/boost/sqlite/template/template-vc10.vcxproj +++ b/boost/sqlite/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/sqlite/template/template-vc10.vcxproj.filters b/boost/sqlite/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/sqlite/template/template-vc10.vcxproj.filters +++ b/boost/sqlite/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/sqlite/template/template-vc9.vcproj b/boost/sqlite/template/template-vc9.vcproj index 93e9ba2..32fb152 100644 --- a/boost/sqlite/template/template-vc9.vcproj +++ b/boost/sqlite/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/mssql/template/Makefile.am b/mssql/template/Makefile.am index 204258b..500c758 100644 --- a/mssql/template/Makefile.am +++ b/mssql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/mssql/template/template-vc10.vcxproj b/mssql/template/template-vc10.vcxproj index 3f5be3e..cf9c6ff 100644 --- a/mssql/template/template-vc10.vcxproj +++ b/mssql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/mssql/template/template-vc10.vcxproj.filters b/mssql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/mssql/template/template-vc10.vcxproj.filters +++ b/mssql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/mssql/template/template-vc9.vcproj b/mssql/template/template-vc9.vcproj index a1b3359..50e7e17 100644 --- a/mssql/template/template-vc9.vcproj +++ b/mssql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/mysql/template/Makefile.am b/mysql/template/Makefile.am index b748228..0ba50ba 100644 --- a/mysql/template/Makefile.am +++ b/mysql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/mysql/template/template-vc10.vcxproj b/mysql/template/template-vc10.vcxproj index 8246eab..0da2efe 100644 --- a/mysql/template/template-vc10.vcxproj +++ b/mysql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/mysql/template/template-vc10.vcxproj.filters b/mysql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/mysql/template/template-vc10.vcxproj.filters +++ b/mysql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/mysql/template/template-vc9.vcproj b/mysql/template/template-vc9.vcproj index 387c18f..58e1a54 100644 --- a/mysql/template/template-vc9.vcproj +++ b/mysql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/oracle/template/Makefile.am b/oracle/template/Makefile.am index 7beba9c..cb3bd54 100644 --- a/oracle/template/Makefile.am +++ b/oracle/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/oracle/template/template-vc10.vcxproj b/oracle/template/template-vc10.vcxproj index f1a91e0..5246cf8 100644 --- a/oracle/template/template-vc10.vcxproj +++ b/oracle/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/oracle/template/template-vc10.vcxproj.filters b/oracle/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/oracle/template/template-vc10.vcxproj.filters +++ b/oracle/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/oracle/template/template-vc9.vcproj b/oracle/template/template-vc9.vcproj index 97cff07..bf9b1a7 100644 --- a/oracle/template/template-vc9.vcproj +++ b/oracle/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/pgsql/template/Makefile.am b/pgsql/template/Makefile.am index fdcd8b1..0d632cc 100644 --- a/pgsql/template/Makefile.am +++ b/pgsql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/pgsql/template/template-vc10.vcxproj b/pgsql/template/template-vc10.vcxproj index 87f2ee1..4bf096a 100644 --- a/pgsql/template/template-vc10.vcxproj +++ b/pgsql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/pgsql/template/template-vc10.vcxproj.filters b/pgsql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/pgsql/template/template-vc10.vcxproj.filters +++ b/pgsql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/pgsql/template/template-vc9.vcproj b/pgsql/template/template-vc9.vcproj index 07d580d..3a75a38 100644 --- a/pgsql/template/template-vc9.vcproj +++ b/pgsql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/qt/mssql/template/Makefile.am b/qt/mssql/template/Makefile.am index 7d944cc..f05c501 100644 --- a/qt/mssql/template/Makefile.am +++ b/qt/mssql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/qt/mssql/template/template-vc10.vcxproj b/qt/mssql/template/template-vc10.vcxproj index a3477e0..e4902d0 100644 --- a/qt/mssql/template/template-vc10.vcxproj +++ b/qt/mssql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/qt/mssql/template/template-vc10.vcxproj.filters b/qt/mssql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/qt/mssql/template/template-vc10.vcxproj.filters +++ b/qt/mssql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/qt/mssql/template/template-vc9.vcproj b/qt/mssql/template/template-vc9.vcproj index dc06622..da1b5ab 100644 --- a/qt/mssql/template/template-vc9.vcproj +++ b/qt/mssql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/qt/mysql/template/Makefile.am b/qt/mysql/template/Makefile.am index 1fe0055..55c7643 100644 --- a/qt/mysql/template/Makefile.am +++ b/qt/mysql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/qt/mysql/template/template-vc10.vcxproj b/qt/mysql/template/template-vc10.vcxproj index 0460825..0f57bbe 100644 --- a/qt/mysql/template/template-vc10.vcxproj +++ b/qt/mysql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/qt/mysql/template/template-vc10.vcxproj.filters b/qt/mysql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/qt/mysql/template/template-vc10.vcxproj.filters +++ b/qt/mysql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/qt/mysql/template/template-vc9.vcproj b/qt/mysql/template/template-vc9.vcproj index 031e923..a904d40 100644 --- a/qt/mysql/template/template-vc9.vcproj +++ b/qt/mysql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/qt/oracle/template/Makefile.am b/qt/oracle/template/Makefile.am index 6e23f58..df3e7c4 100644 --- a/qt/oracle/template/Makefile.am +++ b/qt/oracle/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/qt/oracle/template/template-vc10.vcxproj b/qt/oracle/template/template-vc10.vcxproj index 0ea856a..6e7c369 100644 --- a/qt/oracle/template/template-vc10.vcxproj +++ b/qt/oracle/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/qt/oracle/template/template-vc10.vcxproj.filters b/qt/oracle/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/qt/oracle/template/template-vc10.vcxproj.filters +++ b/qt/oracle/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/qt/oracle/template/template-vc9.vcproj b/qt/oracle/template/template-vc9.vcproj index a350894..292b899 100644 --- a/qt/oracle/template/template-vc9.vcproj +++ b/qt/oracle/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/qt/pgsql/template/Makefile.am b/qt/pgsql/template/Makefile.am index f5f1eed..18fe499 100644 --- a/qt/pgsql/template/Makefile.am +++ b/qt/pgsql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/qt/pgsql/template/template-vc10.vcxproj b/qt/pgsql/template/template-vc10.vcxproj index bc51721..1c1e1a7 100644 --- a/qt/pgsql/template/template-vc10.vcxproj +++ b/qt/pgsql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/qt/pgsql/template/template-vc10.vcxproj.filters b/qt/pgsql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/qt/pgsql/template/template-vc10.vcxproj.filters +++ b/qt/pgsql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/qt/pgsql/template/template-vc9.vcproj b/qt/pgsql/template/template-vc9.vcproj index 19cffcf..2e9e84b 100644 --- a/qt/pgsql/template/template-vc9.vcproj +++ b/qt/pgsql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/qt/sqlite/template/Makefile.am b/qt/sqlite/template/Makefile.am index 2470afe..d6a565a 100644 --- a/qt/sqlite/template/Makefile.am +++ b/qt/sqlite/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/qt/sqlite/template/template-vc10.vcxproj b/qt/sqlite/template/template-vc10.vcxproj index d705b5c..5d4cd02 100644 --- a/qt/sqlite/template/template-vc10.vcxproj +++ b/qt/sqlite/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/qt/sqlite/template/template-vc10.vcxproj.filters b/qt/sqlite/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/qt/sqlite/template/template-vc10.vcxproj.filters +++ b/qt/sqlite/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/qt/sqlite/template/template-vc9.vcproj b/qt/sqlite/template/template-vc9.vcproj index 962bde9..b52f2ec 100644 --- a/qt/sqlite/template/template-vc9.vcproj +++ b/qt/sqlite/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/sqlite/template/Makefile.am b/sqlite/template/Makefile.am index baea455..5d9d107 100644 --- a/sqlite/template/Makefile.am +++ b/sqlite/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/sqlite/template/template-vc10.vcxproj b/sqlite/template/template-vc10.vcxproj index 9cf0599..8e11aa6 100644 --- a/sqlite/template/template-vc10.vcxproj +++ b/sqlite/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/sqlite/template/template-vc10.vcxproj.filters b/sqlite/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/sqlite/template/template-vc10.vcxproj.filters +++ b/sqlite/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/sqlite/template/template-vc9.vcproj b/sqlite/template/template-vc9.vcproj index 490567e..960f086 100644 --- a/sqlite/template/template-vc9.vcproj +++ b/sqlite/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -- cgit v1.1