From a22d7e4d2213553e8e1bf07e35c731f5238af1b9 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 8 Jul 2014 20:04:33 +0200
Subject: [PATCH] Allow Proj4js to be loaded after OpenLayers

---
 src/ol/proj/proj.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index 385b1736e2..03689ec86a 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -14,14 +14,6 @@ goog.require('ol.extent');
 goog.require('ol.sphere.NORMAL');
 
 
-/**
- * Have Proj4js.
- * @const
- * @type {boolean}
- */
-ol.HAVE_PROJ4JS = ol.ENABLE_PROJ4JS && typeof proj4 == 'function';
-
-
 /**
  * A projection as {@link ol.proj.Projection}, SRS identifier string or
  * undefined.
@@ -485,7 +477,8 @@ ol.proj.get = function(projectionLike) {
     var code = projectionLike;
     var projections = ol.proj.projections_;
     projection = projections[code];
-    if (ol.HAVE_PROJ4JS && !goog.isDef(projection)) {
+    if (ol.ENABLE_PROJ4JS && !goog.isDef(projection) &&
+        goog.isFunction(proj4)) {
       var def = proj4.defs[code];
       if (goog.isDef(def)) {
         var units = def.units;