php · omars44 · May 15, 2024 · May 15, 2024 · May 15, 2024
diff --git a/config.m4 b/config.m4
@@ -85,7 +85,7 @@ if test "$PHP_SOLR" != "no"; then
     subdir=src/php5
     AC_MSG_RESULT([PHP 5])
     ],[
-    subdir=src/php7
+    subdir=src
     AC_MSG_RESULT([PHP 7])
     ])
 

diff --git a/config.w32 b/config.w32
@@ -91,7 +91,7 @@ if(PHP_SOLR != 'no')
 		/* XXX tricky job here, override configure_module_dirname, define the basic extension,
 			then set it back*/
 		var old_conf_dir = configure_module_dirname;
-		configure_module_dirname = configure_module_dirname + "\\src\\php7";
+		configure_module_dirname = configure_module_dirname + "\\src";
 
 		EXTENSION('solr',
 					'php_solr.c php_solr_client.c php_solr_document.c php_solr_exception.c ' +

diff --git a/src/php7/php_solr.c → src/php_solr.c b/src/php7/php_solr.c → src/php_solr.c
diff --git a/src/php7/php_solr.h → src/php_solr.h b/src/php7/php_solr.h → src/php_solr.h
diff --git a/src/php7/php_solr_api.h → src/php_solr_api.h b/src/php7/php_solr_api.h → src/php_solr_api.h
diff --git a/src/php7/php_solr_client.c → src/php_solr_client.c b/src/php7/php_solr_client.c → src/php_solr_client.c
diff --git a/src/php7/php_solr_collapse_function.c → src/php_solr_collapse_function.c b/src/php7/php_solr_collapse_function.c → src/php_solr_collapse_function.c
diff --git a/src/php7/php_solr_dismax_query.c → src/php_solr_dismax_query.c b/src/php7/php_solr_dismax_query.c → src/php_solr_dismax_query.c
diff --git a/src/php7/php_solr_dismax_query.h → src/php_solr_dismax_query.h b/src/php7/php_solr_dismax_query.h → src/php_solr_dismax_query.h
diff --git a/src/php7/php_solr_document.c → src/php_solr_document.c b/src/php7/php_solr_document.c → src/php_solr_document.c
diff --git a/src/php7/php_solr_exception.c → src/php_solr_exception.c b/src/php7/php_solr_exception.c → src/php_solr_exception.c
diff --git a/src/php7/php_solr_extract.c → src/php_solr_extract.c b/src/php7/php_solr_extract.c → src/php_solr_extract.c
diff --git a/src/php7/php_solr_input_document.c → src/php_solr_input_document.c b/src/php7/php_solr_input_document.c → src/php_solr_input_document.c
diff --git a/src/php7/php_solr_object.c → src/php_solr_object.c b/src/php7/php_solr_object.c → src/php_solr_object.c
diff --git a/src/php7/php_solr_params.c → src/php_solr_params.c b/src/php7/php_solr_params.c → src/php_solr_params.c
diff --git a/src/php7/php_solr_query.c → src/php_solr_query.c b/src/php7/php_solr_query.c → src/php_solr_query.c
diff --git a/src/php7/php_solr_response.c → src/php_solr_response.c b/src/php7/php_solr_response.c → src/php_solr_response.c
diff --git a/src/php7/php_solr_utils.c → src/php_solr_utils.c b/src/php7/php_solr_utils.c → src/php_solr_utils.c
diff --git a/src/php7/php_solr_version.h → src/php_solr_version.h b/src/php7/php_solr_version.h → src/php_solr_version.h
diff --git a/src/php7/solr_constants.h → src/solr_constants.h b/src/php7/solr_constants.h → src/solr_constants.h
diff --git a/src/php7/solr_functions_client.c → src/solr_functions_client.c b/src/php7/solr_functions_client.c → src/solr_functions_client.c
diff --git a/src/php7/solr_functions_debug.c → src/solr_functions_debug.c b/src/php7/solr_functions_debug.c → src/solr_functions_debug.c
diff --git a/src/php7/solr_functions_document.c → src/solr_functions_document.c b/src/php7/solr_functions_document.c → src/solr_functions_document.c
diff --git a/src/php7/solr_functions_helpers.c → src/solr_functions_helpers.c b/src/php7/solr_functions_helpers.c → src/solr_functions_helpers.c
diff --git a/src/php7/solr_functions_params.c → src/solr_functions_params.c b/src/php7/solr_functions_params.c → src/solr_functions_params.c
diff --git a/src/php7/solr_functions_response.c → src/solr_functions_response.c b/src/php7/solr_functions_response.c → src/solr_functions_response.c
diff --git a/src/php7/solr_macros.h → src/solr_macros.h b/src/php7/solr_macros.h → src/solr_macros.h
diff --git a/src/php7/solr_string.c → src/solr_string.c b/src/php7/solr_string.c → src/solr_string.c
diff --git a/src/php7/solr_string.h → src/solr_string.h b/src/php7/solr_string.h → src/solr_string.h
diff --git a/src/php7/solr_types.h → src/solr_types.h b/src/php7/solr_types.h → src/solr_types.h