Skip to content
Snippets Groups Projects
Commit d211c19d authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

Make Python interface available from out-of-source builddir with PYTHONPATH

parent 9675a426
No related branches found
No related tags found
1 merge request!40Fix Python interface
......@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
CONFIG_CLEAN_VPATH_FILES = src/mtime/__init__.py src/mtime/libmtime.py
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -168,7 +168,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/compile \
$(top_srcdir)/config/config.h.in \
$(top_srcdir)/config/config.sub \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
$(top_srcdir)/config/missing AUTHORS NEWS README \
$(top_srcdir)/config/missing \
$(top_srcdir)/src/mtime/__init__.py \
$(top_srcdir)/src/mtime/libmtime.py AUTHORS NEWS README \
config/compile config/config.guess config/config.sub \
config/depcomp config/install-sh config/ltmain.sh \
config/missing config/py-compile
......
......@@ -20276,9 +20276,15 @@ else
fi
 
 
ac_config_files="$ac_config_files Makefile doc/Makefile doc/Doxyfile examples/Makefile include/Makefile src/Makefile test/Makefile"
ac_config_files="$ac_config_files Makefile doc/Doxyfile doc/Makefile examples/Makefile include/Makefile src/Makefile test/Makefile"
 
 
if test "x$enable_shared" = xyes
then :
ac_config_links="$ac_config_links src/mtime/__init__.py:src/mtime/__init__.py src/mtime/libmtime.py:src/mtime/libmtime.py"
fi
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
......@@ -20873,6 +20879,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
config_links="$ac_config_links"
config_commands="$ac_config_commands"
 
_ACEOF
......@@ -20903,6 +20910,9 @@ $config_files
Configuration headers:
$config_headers
 
Configuration links:
$config_links
Configuration commands:
$config_commands
 
......@@ -21430,12 +21440,14 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"src/mtime/__init__.py") CONFIG_LINKS="$CONFIG_LINKS src/mtime/__init__.py:src/mtime/__init__.py" ;;
"src/mtime/libmtime.py") CONFIG_LINKS="$CONFIG_LINKS src/mtime/libmtime.py:src/mtime/libmtime.py" ;;
 
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......@@ -21449,6 +21461,7 @@ done
if $ac_need_defaults; then
test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
test ${CONFIG_LINKS+y} || CONFIG_LINKS=$config_links
test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
fi
 
......@@ -21746,7 +21759,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_HEADERS"
 
 
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
shift
for ac_tag
do
......@@ -22023,7 +22036,38 @@ printf "%s\n" X"$_am_arg" |
}
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
:L)
#
# CONFIG_LINK
#
 
if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
:
else
# Prefer the file from the source tree if names are identical.
if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
ac_source=$srcdir/$ac_source
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;}
if test ! -r "$ac_source"; then
as_fn_error $? "$ac_source: file not found" "$LINENO" 5
fi
rm -f "$ac_file"
# Try a relative symlink, then a hard link, then a copy.
case $ac_source in
[\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
*) ac_rel_source=$ac_top_build_prefix$ac_source ;;
esac
ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
ln "$ac_source" "$ac_file" 2>/dev/null ||
cp -p "$ac_source" "$ac_file" ||
as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
fi
;;
:C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
;;
......
......@@ -120,13 +120,19 @@ AM_CONDITIONAL([DX_FLAG_html], [test $DX_FLAG_html -eq 1])
AM_CONDITIONAL([DX_FLAG_ps], [test $DX_FLAG_ps -eq 1])
AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/Doxyfile
examples/Makefile
include/Makefile
src/Makefile
test/Makefile
Makefile
doc/Doxyfile
doc/Makefile
examples/Makefile
include/Makefile
src/Makefile
test/Makefile
])
AS_VAR_IF([enable_shared], [yes],
[AC_CONFIG_LINKS([
src/mtime/__init__.py:src/mtime/__init__.py
src/mtime/libmtime.py:src/mtime/libmtime.py
])])
AC_OUTPUT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment