--- builds/posix/Makefile.in.firebird.orig	2011-06-08 12:44:47.116474678 +0200
+++ builds/posix/Makefile.in.firebird	2011-06-08 12:45:32.306909799 +0200
@@ -185,14 +185,7 @@
 # 
 
 external_libraries:
-ifeq ($(STD_ICU),false)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-endif
-ifeq ($(STD_EDITLINE),false)
-ifeq ($(EDITLINE_FLG),Y)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-endif
-endif
+
 
 btyacc_binary: $(BTYACC)
 
--- builds/posix/make.defaults.orig	2011-06-08 12:50:40.210060423 +0200
+++ builds/posix/make.defaults	2011-06-08 12:51:29.167448303 +0200
@@ -233,11 +233,7 @@
 LIBFBSTATIC_A = $(LIB)/libfbstatic.a
 
 ifeq ($(EDITLINE_FLG),Y)
-  ifeq ($(STD_EDITLINE), true)
-	LIBEDITLINE := -l$(READLINE)
-  else
-	LIBEDITLINE := $(LIB)/libedit.a
-  endif
+  LIBEDITLINE := -ledit
 endif
 
 LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
--- builds/posix/make.rules.orig	2011-06-08 12:52:32.122661372 +0200
+++ builds/posix/make.rules	2011-06-08 12:53:59.503568973 +0200
@@ -33,9 +33,6 @@
 
 # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
 CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
-ifeq ($(STD_ICU),false)
-  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-endif
 
 ifeq ($(IsProdTypeBuild),Y)
   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
@@ -69,7 +66,7 @@
 
 .SUFFIXES: .c .e .epp .cpp
 
-.e.c:
+.e.c: $(GPRE_CURRENT)
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
 
--- builds/posix/make.shared.targets.orig	2011-06-08 12:54:56.632854710 +0200
+++ builds/posix/make.shared.targets	2011-06-08 12:56:17.505843703 +0200
@@ -49,7 +49,7 @@
 
 # gpre_meta needs a special boot build since there is no database.
 
-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
 
 
--- builds/posix/prefix.linux.orig	2011-06-08 12:57:13.861138782 +0200
+++ builds/posix/prefix.linux	2011-06-08 12:58:35.230121875 +0200
@@ -22,10 +22,10 @@
 # you may remove it if engine is getting compiled with any other GCC version
 
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
+COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
 DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
 #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)