mv src-files into subdir "src"

swen100 · Sep 14, 2021 · 4566a4a · 4566a4a
1 parent 56f1743
commit 4566a4a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/config.m4 b/config.m4
@@ -1,10 +1,18 @@
-PHP_ARG_ENABLE(proj, whether to enable Proj support,
-[ --enable-proj   Enable Proj support])
+dnl
+dnl Proj for PHP
+dnl
+
+PHP_ARG_WITH(proj, whether to enable Proj support,
+[ --with-proj   Enable Proj support])
 
 if test "$PHP_PROJ" = "yes"; then
   PHP_ADD_LIBPATH(/usr/lib)
   AC_DEFINE(HAVE_PROJ, 1, [Whether you have Proj])
-  PHP_NEW_EXTENSION(proj, proj.c, $ext_shared)
+
+  PHP_NEW_EXTENSION(proj, \
+    src/proj.c \
+  , $ext_shared)
+
   PHP_SUBST(PROJ_SHARED_LIBADD)
   PHP_ADD_LIBRARY(proj, 1, PROJ_SHARED_LIBADD)
   PHP_CHECK_LIBRARY(proj, proj_trans, [], [AC_MSG_ERROR([proj library or proj_trans() function in this library not found. Check config.log for more information.])])

diff --git a/config.w32 b/config.w32
@@ -1,6 +1,8 @@
 ARG_WITH("proj", "PROJ module", "no");
 
 if (PHP_PROJ == "yes") {
+    configure_module_dirname = configure_module_dirname + "\\src";
+
     CHECK_HEADER_ADD_INCLUDE("proj/proj_api.h", "CFLAGS_PROJ", PHP_PROJ + "\\include", null, true);
     CHECK_LIB("proj.lib", "proj", PHP_PROJ + "\\lib")
 

diff --git a/package.xml b/package.xml
@@ -32,8 +32,8 @@
             <file role="src" name="config.m4"/>
             <file role="src" name="config.w32"/>
 
-            <file role="src" name="proj.c"/>
-            <file role="src" name="php_proj.h"/>
+            <file role="src" name="src/proj.c"/>
+            <file role="src" name="src/php_proj.h"/>
         </dir>
     </contents>
     <dependencies>

diff --git a/php_proj.h → src/php_proj.h b/php_proj.h → src/php_proj.h
diff --git a/proj.c → src/proj.c b/proj.c → src/proj.c
@@ -8,7 +8,7 @@
 #include <zend_types.h>
 #include <zend_string.h>
 #include <ext/standard/php_string.h>
-#include <php_proj.h>
+#include <src/php_proj.h>
 
 int proj_destructor;
 int proj_area_destructor;

diff --git a/tests/proj_create_crs_to_crs_from_pj.phpt b/tests/proj_create_crs_to_crs_from_pj.phpt
diff --git a/tests/proj_get_pj_info.phpt b/tests/proj_get_pj_info.phpt