aboutsummaryrefslogtreecommitdiff
path: root/mssql
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 /mssql
parent5aa48fc52202fd95210d8860b66769550732a5d9 (diff)
Use __ifelse__ instead of m4_ifelse2.1.0.a1
Diffstat (limited to 'mssql')
-rw-r--r--mssql/template/Makefile.am2
-rw-r--r--mssql/template/template-vc10.vcxproj6
-rw-r--r--mssql/template/template-vc10.vcxproj.filters4
-rw-r--r--mssql/template/template-vc9.vcproj4
4 files changed, 8 insertions, 8 deletions
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 @@
<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/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 @@
</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/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)
</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,