final php3.ini -> php.ini renaming?

diff --git a/acconfig.h.in b/acconfig.h.in
index de243750546e86e752d8ccb25647d11ced57113a..9d5f57930445b6bdf0f9b839542cc86f2f7a6636 100644 (file)
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -7,7 +7,7 @@
 #undef HAVE_STRUCT_FLOCK
 #undef HAVE_TM_GMTOFF
 
-#define CONFIGURATION_FILE_PATH "php3.ini"
+#define CONFIGURATION_FILE_PATH "php.ini"
 #define USE_CONFIG_FILE 1
 
 #undef HAVE_DMALLOC

diff --git a/configure.in.in b/configure.in.in
index 108fac58bb3276822117653257882a386e18e91a..88120b60b1cb195abb96b7eeebffcce6fd6a8660 100644 (file)
--- a/configure.in.in
+++ b/configure.in.in
@@ -38,7 +38,7 @@ dnl ## libraries and so on.
 dnl ## In diversion 2 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies.  This
 dnl ## includes what regex library is used and whether debugging or short
-dnl ## tags are enabled, and the default behaviour of php3.ini options.
+dnl ## tags are enabled, and the default behaviour of php.ini options.
 dnl ## This is also where an SAPI interface is selected (choosing between
 dnl ## Apache module, CGI etc.)
 
@@ -598,7 +598,7 @@ AC_SUBST(FHTTPD_TARGET)
 
 AC_MSG_CHECKING(whether to use a configuration file)
 AC_ARG_WITH(config-file-path,
-[  --with-config-file-path=PATH  Sets the path in which to look for php3.ini
+[  --with-config-file-path=PATH  Sets the path in which to look for php.ini
                           defaults to /usr/local/lib],
 [
   if test "$withval" = "yes"; then