Skip to content

Commit

Permalink
php: remove PHP5 support
Browse files Browse the repository at this point in the history
References: KC-1042
  • Loading branch information
jengelh committed Aug 15, 2019
1 parent 2b8011e commit 153067d
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 8,328 deletions.
24 changes: 3 additions & 21 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -776,14 +776,10 @@ dist_phpsysconf_DATA = php-ext/mapi.ini
# PHP extension
#
phplibdir = ${dcprefix}${PHP_EXTENSION_DIR}
phplib_LTLIBRARIES =
mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES}
mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES} -I${srcdir}/php7-ext -I${srcdir}/php-ext
mapi_la_CXXFLAGS = ${AM_CXXFLAGS} ${ZPHPCXXFLAGS}
mapi_la_SOURCES =
if WITH_PHP7
phplib_LTLIBRARIES += mapi.la
mapi_la_CPPFLAGS += -I${srcdir}/php7-ext -I${srcdir}/php-ext
mapi_la_SOURCES += \
phplib_LTLIBRARIES = mapi.la
mapi_la_SOURCES = \
php7-ext/ECImportContentsChangesProxy.cpp \
php7-ext/ECImportContentsChangesProxy.h \
php7-ext/ECImportHierarchyChangesProxy.cpp \
Expand All @@ -793,20 +789,6 @@ mapi_la_SOURCES += \
php-ext/phpconfig.h \
php7-ext/typeconversion.cpp php7-ext/typeconversion.h \
php-ext/util.cpp php-ext/util.h
endif
if WITH_PHP5
phplib_LTLIBRARIES += mapi.la
mapi_la_SOURCES += \
php-ext/ECImportContentsChangesProxy.cpp \
php-ext/ECImportContentsChangesProxy.h \
php-ext/ECImportHierarchyChangesProxy.cpp \
php-ext/ECImportHierarchyChangesProxy.h \
php-ext/ECRulesTableProxy.cpp php-ext/ECRulesTableProxy.h \
php-ext/globals.h php-ext/main.cpp php-ext/main.h \
php-ext/phpconfig.h \
php-ext/typeconversion.cpp php-ext/typeconversion.h \
php-ext/util.cpp php-ext/util.h
endif
mapi_la_LIBADD = libmapi.la libkcutil.la libkcfreebusy.la \
libkcinetmapi.la libkcicalmapi.la -lpthread
mapi_la_SYFLAGS = -Wl,--version-script=${srcdir}/php-ext/mapi.sym
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ AS_IF([test "$with_php" != "no"], [
PHP_CHECK_INCLUDES
echo "PHP version: $PHP_VERSION"
AS_CASE([$PHP_VERSION],
[5.*], [with_php=5],
[5.*], [AC_MSG_ERROR([php5 is not supported])],
[7.*], [with_php=7]
)
])
Expand Down Expand Up @@ -687,7 +687,6 @@ AM_CONDITIONAL([WITH_EPOLL], [test "$want_epoll" = "yes"])
AM_CONDITIONAL([WITH_KRB5], [test -n "$KRB5_LIBS"])
AM_CONDITIONAL([WITH_LDAP], [test "$want_ldap" = yes])
AM_CONDITIONAL([WITH_PAM], [test -n "$PAM_LIBS"])
AM_CONDITIONAL([WITH_PHP5], [test "$with_php" = 5])
AM_CONDITIONAL([WITH_PHP7], [test "$with_php" = 7])
AM_CONDITIONAL([WITH_UNIX], [test "$want_unix" = yes])
AS_IF([test -n "$PYTHON_LIBS" || test -n "$PYTHON"], [AM_PATH_PYTHON([2.5])])
Expand Down
2 changes: 1 addition & 1 deletion doc/install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Optional build-time dependencies and their minimum versions:
* libtidy 5.0 from tidy-html
* Linux-PAM 1.1
* OpenLDAP libldap_r 2.4
* PHP 5.4
* PHP 7.0
* Python 3.5 & swig 2.x
* rrdtool librrd 1.3

Expand Down
279 changes: 0 additions & 279 deletions php-ext/ECImportContentsChangesProxy.cpp

This file was deleted.

35 changes: 0 additions & 35 deletions php-ext/ECImportContentsChangesProxy.h

This file was deleted.

0 comments on commit 153067d

Please sign in to comment.