From fe4bbf557b396297395a77a45f86ceb4c9192376 Mon Sep 17 00:00:00 2001
From: brodsom <brodsom@users.sourceforge.net>
Date: Tue, 25 Feb 2003 00:46:57 +0000
Subject: [PATCH] Restore intl_backend as intl_builtin (needed by Nickolay)

---
 src/jrd/intl.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/jrd/intl.cpp b/src/jrd/intl.cpp
index 2c0c2a7f31..f399c126c5 100644
--- a/src/jrd/intl.cpp
+++ b/src/jrd/intl.cpp
@@ -105,6 +105,9 @@
 #include "../intl/country_codes.h"
 #include "../jrd/gdsassert.h"
 #include "../jrd/license.h"
+#ifdef INTL_BUILTIN
+#include "../intl/ld_proto.h"
+#endif
 #include "../jrd/all_proto.h"
 #include "../jrd/cvt_proto.h"
 #include "../jrd/err_proto.h"
@@ -2159,6 +2162,10 @@ static void* intl_back_compat_obj_init_lookup(
 
 	function = NULL;
 
+#ifdef INTL_BUILTIN
+	if (LD_lookup(type, &function, parm1, parm2) != 0)
+		function = NULL;
+#else
 	/* Look for an InterBase supplied object to implement the text type */
 	/* The flu.c uses searchpath which expects a file name not a path */
 	INTL_TRACE(("INTL: trying %s %s\n", INTL_MODULE1, INTL_LOOKUP_ENTRY1));
@@ -2175,8 +2182,13 @@ static void* intl_back_compat_obj_init_lookup(
 			return (void*) function;
 		}
 	}
+#endif
 
 /* Still not found, check the set of supplimental international objects */
+#ifdef INTL_BUILTIN
+	if (LD2_lookup(type, &function, parm1, parm2) != 0)
+		function = NULL
+#else
 	/* Look for an InterBase supplied object to implement the text type */
 	/* The flu.c uses searchpath which expects a file name not a path */
 	INTL_TRACE(("INTL: trying %s %s\n", INTL_MODULE2, INTL_LOOKUP_ENTRY2));
@@ -2193,6 +2205,7 @@ static void* intl_back_compat_obj_init_lookup(
 			return (void*) function;
 		}
 	}
+#endif
 
 /* Still not found, check if there is a UDF in the database defined the right way */
 	FUN function_block;