aboutsummaryrefslogtreecommitdiff
path: root/qt
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-07-17 15:17:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-07-17 15:17:09 +0200
commit3be0180445eaed554bf001d59e2cfa4389f94c10 (patch)
treea765e7d7db3c61f751defa2f659167a410b800bb /qt
parent5aa48fc52202fd95210d8860b66769550732a5d9 (diff)
Use __ifelse__ instead of m4_ifelse2.1.0.a1
Diffstat (limited to 'qt')
-rw-r--r--qt/mssql/template/Makefile.am2
-rw-r--r--qt/mssql/template/template-vc10.vcxproj6
-rw-r--r--qt/mssql/template/template-vc10.vcxproj.filters4
-rw-r--r--qt/mssql/template/template-vc9.vcproj4
-rw-r--r--qt/mysql/template/Makefile.am2
-rw-r--r--qt/mysql/template/template-vc10.vcxproj6
-rw-r--r--qt/mysql/template/template-vc10.vcxproj.filters4
-rw-r--r--qt/mysql/template/template-vc9.vcproj4
-rw-r--r--qt/oracle/template/Makefile.am2
-rw-r--r--qt/oracle/template/template-vc10.vcxproj6
-rw-r--r--qt/oracle/template/template-vc10.vcxproj.filters4
-rw-r--r--qt/oracle/template/template-vc9.vcproj4
-rw-r--r--qt/pgsql/template/Makefile.am2
-rw-r--r--qt/pgsql/template/template-vc10.vcxproj6
-rw-r--r--qt/pgsql/template/template-vc10.vcxproj.filters4
-rw-r--r--qt/pgsql/template/template-vc9.vcproj4
-rw-r--r--qt/sqlite/template/Makefile.am2
-rw-r--r--qt/sqlite/template/template-vc10.vcxproj6
-rw-r--r--qt/sqlite/template/template-vc10.vcxproj.filters4
-rw-r--r--qt/sqlite/template/template-vc9.vcproj4
20 files changed, 40 insertions, 40 deletions
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 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
m4_dnl
<ItemGroup>
__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)
</ItemGroup>)
<ItemGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__header_entry__(test-odb.hxx)
__header_entry__(test-odb.ixx))
__header_entries__(extra_headers)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
-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)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
</Project> \ 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)
</Filter>
<Filter
@@ -345,7 +345,7 @@ __source_entries__(extra_sources)
Filter="h;hxx;ixx;txx"
UniqueIdentifier="{__uuid__()}"
>
-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 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
m4_dnl
<ItemGroup>
__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)
</ItemGroup>)
<ItemGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__header_entry__(test-odb.hxx)
__header_entry__(test-odb.ixx))
__header_entries__(extra_headers)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
-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)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
</Project> \ 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)
</Filter>
<Filter
@@ -345,7 +345,7 @@ __source_entries__(extra_sources)
Filter="h;hxx;ixx;txx"
UniqueIdentifier="{__uuid__()}"
>
-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 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
m4_dnl
<ItemGroup>
__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)
</ItemGroup>)
<ItemGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__header_entry__(test-odb.hxx)
__header_entry__(test-odb.ixx))
__header_entries__(extra_headers)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
-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)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
</Project> \ 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)
</Filter>
<Filter
@@ -345,7 +345,7 @@ __source_entries__(extra_sources)
Filter="h;hxx;ixx;txx"
UniqueIdentifier="{__uuid__()}"
>
-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 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
m4_dnl
<ItemGroup>
__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)
</ItemGroup>)
<ItemGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__header_entry__(test-odb.hxx)
__header_entry__(test-odb.ixx))
__header_entries__(extra_headers)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
-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)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
</Project> \ 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)
</Filter>
<Filter
@@ -345,7 +345,7 @@ __source_entries__(extra_sources)
Filter="h;hxx;ixx;txx"
UniqueIdentifier="{__uuid__()}"
>
-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 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
m4_dnl
<ItemGroup>
__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)
</ItemGroup>)
<ItemGroup>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__header_entry__(test-odb.hxx)
__header_entry__(test-odb.ixx))
__header_entries__(extra_headers)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
-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)
</ItemGroup>
<ItemGroup>
__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)
</ItemGroup>
</Project> \ 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)
</Filter>
<Filter
@@ -345,7 +345,7 @@ __source_entries__(extra_sources)
Filter="h;hxx;ixx;txx"
UniqueIdentifier="{__uuid__()}"
>
-m4_ifelse(__value__(odb_options),,,
+__ifelse__(__value__(odb_options),,,
__file_entry_custom_build__(
test.hxx,
odb test.hxx,