Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 24779)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 24780)
@@ -1471,31 +1471,31 @@
 	fi
 	dnl }}}
-	dnl PROJ.4{{{
+	dnl PROJ{{{
 	AC_ARG_WITH(
 		[proj4-dir],
-		AS_HELP_STRING([--with-proj4-dir=DIR], [PROJ.4 root directory]),
-		[PROJ4_ROOT=${withval}],
-		[PROJ4_ROOT="no"]
-	)
-	AC_MSG_CHECKING([for PROJ.4])
-	if test "x${PROJ4_ROOT}" == "xno"; then
-		HAVE_PROJ4=no
-	else
-		HAVE_PROJ4=yes
-		if ! test -d "${PROJ4_ROOT}"; then
-			AC_MSG_ERROR([PROJ.4 directory provided (${PROJ4_ROOT}) does not exist!]);
-		fi
-	fi
-	AC_MSG_RESULT([${HAVE_PROJ4}])
-
-	dnl PROJ.4 libraries and header files
-	if test "x${HAVE_PROJ4}" == "xyes"; then
-		PROJ4INCL="-I${PROJ4_ROOT}/include"
-		PROJ4LIB="-L${PROJ4_ROOT}/lib -lproj"
-		AC_DEFINE([_HAVE_PROJ4_], [1], [with PROJ4 in ISSM src])
-		AC_SUBST([PROJ4INCL])
-		AC_SUBST([PROJ4LIB])
-	fi
-	AM_CONDITIONAL([PROJ4], [test "x${HAVE_PROJ4}" == "xyes"])
+		AS_HELP_STRING([--with-proj4-dir=DIR], [PROJ root directory]),
+		[PROJ_ROOT=${withval}],
+		[PROJ_ROOT="no"]
+	)
+	AC_MSG_CHECKING([for PROJ])
+	if test "x${PROJ_ROOT}" == "xno"; then
+		HAVE_PROJ=no
+	else
+		HAVE_PROJ=yes
+		if ! test -d "${PROJ_ROOT}"; then
+			AC_MSG_ERROR([PROJ directory provided (${PROJ_ROOT}) does not exist!]);
+		fi
+	fi
+	AC_MSG_RESULT([${HAVE_PROJ}])
+
+	dnl PROJ libraries and header files
+	if test "x${HAVE_PROJ}" == "xyes"; then
+		PROJINCL="-I${PROJ_ROOT}/include"
+		PROJLIB="-L${PROJ_ROOT}/lib -lproj"
+		AC_DEFINE([_HAVE_PROJ_], [1], [with PROJ in ISSM src])
+		AC_SUBST([PROJINCL])
+		AC_SUBST([PROJLIB])
+	fi
+	AM_CONDITIONAL([PROJ], [test "x${HAVE_PROJ}" == "xyes"])
 	dnl }}}
 	dnl SLEPc{{{
Index: /issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp	(revision 24779)
+++ /issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp	(revision 24780)
@@ -11,6 +11,6 @@
 void CoordinateSystemTransformx(double** px_dest,double** py_dest,double* x_src,double* y_src,int size,const char* str_src,const char* str_dst){
 
-#if !defined(_HAVE_PROJ4_)
-	_error_("proj.4 has not been installed");
+#if !defined(_HAVE_PROJ_)
+	_error_("proj not installed");
 #else
 
@@ -27,10 +27,10 @@
 	projPJ pj_src  = pj_init_plus(str_src);
 	projPJ pj_dst  = pj_init_plus(str_dst);
-	if(!pj_src) _error_("Failed to initialize PROJ.4 with source projection \""    <<str_src<<"\"\n");
-	if(!pj_dst) _error_("Failed to initialize PROJ.4 with destination projection\""<<str_dst<<"\"\n");
+	if(!pj_src) _error_("Failed to initialize PROJ with source projection \""    <<str_src<<"\"\n");
+	if(!pj_dst) _error_("Failed to initialize PROJ with destination projection\""<<str_dst<<"\"\n");
 
 	/*Perform transformation*/
 	int p = pj_transform(pj_src,pj_dst,size,1,x_dest,y_dest,NULL);
-	if(p!=0) _error_("Reprojection failed, PROJ.4 error code: "<<p<<"\n");
+	if(p!=0) _error_("Reprojection failed, PROJ error code: "<<p<<"\n");
 
 	/*Output : */