[gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: gdl-0.9_rc1-proj4.patch

[gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: gdl-0.9_rc1-proj4.patch

[Sebastien Fabbro (bicatali)]

bicatali    08/05/22 15:29:38

  Added:                gdl-0.9_rc1-proj4.patch
  Log:
  Version bump
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.1                  dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch?rev=1.1&content-type=text/plain

Index: gdl-0.9_rc1-proj4.patch
===================================================================
--- configure.in.orig	2008-05-22 15:03:04.000000000 +0000
+++ configure.in	2008-05-22 15:03:19.000000000 +0000
@@ -482,14 +482,14 @@
 
 if test "x$with_libproj4" != "xno"; then
   if test "x$with_libproj4" != "xyes"; then
-    LIBS="$LIBS -L$with_libproj4/lib -lproj4"
+    LIBS="$LIBS -L$with_libproj4/lib -lproj"
     INCLUDES="$INCLUDES -I$with_libproj4/include"
   else
     INCLUDES="$INCLUDES -I/usr/include"
-    LIBS="$LIBS -lproj4"
+    LIBS="$LIBS -lproj"
   fi
 
-  AC_CHECK_LIB(proj4, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], [Define if you want to use LIBPROJ4])], [
+  AC_CHECK_LIB(proj, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], [Define if you want to use LIBPROJ4])], [
     echo ""
     echo "Error! LIBPROJ4 is required but was not found"
     echo "       Use --with-libproj4=DIR to specify the LIBPROJ4 directory tree"
--- src/math_utl.hpp.orig	2008-05-22 15:00:39.000000000 +0000
+++ src/math_utl.hpp	2008-05-22 15:01:46.000000000 +0000
@@ -42,7 +42,7 @@
 #define COMPLEX COMPLEX2
 
 extern "C" {
-#include "lib_proj.h"
+#include <projects.h>
 }
 
   PJ *map_init();



-- 
gentoo-commits@lists.gentoo.org mailing list