.gitignore | 63 ------------------------------------------------- configure.ac | 3 +-- docs/doxygen.config | 2 +- m4/ax_python_devel.m4 | 63 +++++++++++++++++-------------------------------- swig/python/Makefile.am | 2 +- 5 files changed, 24 insertions(+), 109 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7629e9a9..00000000 --- a/.gitignore +++ /dev/null @@ -1,63 +0,0 @@ -*.user -*.ncb -*.suo -*.sdf -*.opensdf -.#* -*~ -*.bak -ipch/ -autom4te.cache/ -objdir*/ -Win32/ -x64/ -build/ -.vscode/ - -docs/log4cplus-*/ -docs/webpage_docs-*/ - -.idea - -# LaTeX/PDF produciton byproducts -*.aux -*.log -*.tex -*.toc -*.xwm -*.pdf -*.ref_rename_step - -# Compiler produced temporaries -*.s -*.ii - -# Patches -*.patch -*.diff - -# -# From Github's C++.gitignore: -# - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app diff --git a/configure.ac b/configure.ac index ecc6b5d4..b02c0a3c 100644 --- a/configure.ac +++ b/configure.ac @@ -441,8 +441,7 @@ AS_CASE(["$target_os"], dnl Checks for header files. -AC_CHECK_INCLUDES_DEFAULT -AC_PROG_EGREP +AC_HEADER_STDC LOG4CPLUS_CHECK_HEADER([sys/types.h], [LOG4CPLUS_HAVE_SYS_TYPES_H]) LOG4CPLUS_CHECK_HEADER([sys/socket.h], [LOG4CPLUS_HAVE_SYS_SOCKET_H]) diff --git a/docs/doxygen.config b/docs/doxygen.config index d1e11aa8..a67a824f 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -58,7 +58,7 @@ PROJECT_LOGO = log4cplus.svg # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = log4cplus-2.0.7/docs +OUTPUT_DIRECTORY = . # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 index 59a2ff09..1bc97ac3 100644 --- a/m4/ax_python_devel.m4 +++ b/m4/ax_python_devel.m4 @@ -132,30 +132,15 @@ variable to configure. See ``configure --help'' for reference. fi fi - # - # Check if you have distutils, else fail - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` - if test -z "$ac_distutils_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot import Python module "distutils". -Please check your Python installation. The error was: -$ac_distutils_result]) - PYTHON_VERSION="" - fi - # # Check for Python include path # AC_MSG_CHECKING([for Python include path]) if test -z "$PYTHON_CPPFLAGS"; then - python_path=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_inc ());"` - plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + python_path=`$PYTHON -c "import sysconfig; \ + print(sysconfig.get_path('include'));"` + plat_python_path=`$PYTHON -c "import sysconfig; \ + print(sysconfig.get_path('platinclude'));"` if test -n "${python_path}"; then if test "${plat_python_path}" != "${python_path}"; then python_path="-I$python_path -I$plat_python_path" @@ -179,7 +164,7 @@ $ac_distutils_result]) # join all versioning strings, on some systems # major/minor numbers could be in different list elements -from distutils.sysconfig import * +from sysconfig import * e = get_config_var('VERSION') if e is not None: print(e) @@ -202,8 +187,8 @@ EOD` ac_python_libdir=`cat<