Group :: Desenvolvimento/C++
RPM: log4cplus
Navegação
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: log4cplus-2.0.7-alt.patch
Download
Download
.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
-*.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}"; thenpython_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<<EOD | $PYTHON -
# There should be only one
-import distutils.sysconfig
-e = distutils.sysconfig.get_config_var('LIBDIR')+import sysconfig
+e = sysconfig.get_config_var('LIBDIR')if e is not None:
print (e)
EOD`
@@ -211,8 +196,8 @@ EOD`
# Now, for the library:
ac_python_library=`cat<<EOD | $PYTHON -
-import distutils.sysconfig
-c = distutils.sysconfig.get_config_vars()
+import sysconfig
+c = sysconfig.get_config_vars()
if 'LDVERSION' in c:
print ('python'+c[['LDVERSION']])else:
@@ -223,19 +208,13 @@ EOD`
# credits goes to momjian, I think. I'd like to put the right name
# in the credits, if someone can point me in the right direction... ?
#
- if test -n "$ac_python_libdir" -a -n "$ac_python_library"
- then
- # use the official shared library
- ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
- else
- # old way: use libpython from python_configdir
- ac_python_libdir=`$PYTHON -c \
- "from distutils.sysconfig import get_python_lib as f; \
- import os; \
- print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
+ # use the official shared library
+ ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+ if test -z "$ac_python_libdir" ; then
+ full_python=`which $PYTHON`
+ ac_python_libdir=`AS_DIRNAME($full_python)`
fi
+ PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
if test -z "PYTHON_LDFLAGS"; then
AC_MSG_ERROR([
@@ -252,8 +231,8 @@ EOD`
#
AC_MSG_CHECKING([for Python site-packages path])
if test -z "$PYTHON_SITE_PKG"; then
- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
- print (distutils.sysconfig.get_python_lib(0,0));"`
+ PYTHON_SITE_PKG=`$PYTHON -c "import sysconfig; \
+ print(sysconfig.get_path('purelib'));"`fi
AC_MSG_RESULT([$PYTHON_SITE_PKG])
AC_SUBST([PYTHON_SITE_PKG])
@@ -263,8 +242,8 @@ EOD`
#
AC_MSG_CHECKING(python extra libraries)
if test -z "$PYTHON_EXTRA_LIBS"; then
- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
- conf = distutils.sysconfig.get_config_var; \
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sysconfig; \
+ conf = sysconfig.get_config_var; \
print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`fi
AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
@@ -275,8 +254,8 @@ EOD`
#
AC_MSG_CHECKING(python extra linking flags)
if test -z "$PYTHON_EXTRA_LDFLAGS"; then
- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
- conf = distutils.sysconfig.get_config_var; \
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sysconfig; \
+ conf = sysconfig.get_config_var; \
print (conf('LINKFORSHARED'))"`fi
AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
index 87a294da..71f9e99e 100644
--- a/swig/python/Makefile.am
+++ b/swig/python/Makefile.am
@@ -35,7 +35,7 @@ _log4cplusU_la_LIBADD = $(liblog4cplusU_la_file)
$(PYTHON_WRAPU_CXX): $(SWIG_SOURCES)
$(SWIG) -DUNICODE=1 -D_UNICODE=1 $(SWIG_FLAGS) -c++ -python $(SWIG_PYTHON_OPT) \
-I$(top_srcdir)/include -I$(top_builddir)/include \
- -I$(top_srcdir)/swig -o $(PYTHON_WRAPU_CXX) \
+ -I$(top_srcdir)/swig -o $(PYTHON_WRAPU_CXX) -module log4cplusU \
$(top_srcdir)/swig/log4cplus.swg
endif