From 3be0180445eaed554bf001d59e2cfa4389f94c10 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 17 Jul 2012 15:17:09 +0200
Subject: Use __ifelse__ instead of m4_ifelse

---
 oracle/template/Makefile.am                   | 2 +-
 oracle/template/template-vc10.vcxproj         | 6 +++---
 oracle/template/template-vc10.vcxproj.filters | 4 ++--
 oracle/template/template-vc9.vcproj           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'oracle')

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 @@
       <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/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 @@
     </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/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)
 		</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,
-- 
cgit v1.1