Commit c3a9b9d7 authored by Chyla Zbigniew's avatar Chyla Zbigniew

Added plugins/python-loader/Makefile, plugins/gnome-glossary/Makefile,


* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.

* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
parent b8692b30
2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.
* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
2001-03-05 Zbigniew Chyla <cyba@gnome.pl> 2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
Fixes #51316 (actually, it fixes the _real_ problem). Fixes #51316 (actually, it fixes the _real_ problem).
......
2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.
* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
2001-03-05 Zbigniew Chyla <cyba@gnome.pl> 2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
Fixes #51316 (actually, it fixes the _real_ problem). Fixes #51316 (actually, it fixes the _real_ problem).
......
2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.
* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
2001-03-05 Zbigniew Chyla <cyba@gnome.pl> 2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
Fixes #51316 (actually, it fixes the _real_ problem). Fixes #51316 (actually, it fixes the _real_ problem).
......
2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.
* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
2001-03-05 Zbigniew Chyla <cyba@gnome.pl> 2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
Fixes #51316 (actually, it fixes the _real_ problem). Fixes #51316 (actually, it fixes the _real_ problem).
......
2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
* configure.in:
(AC_OUTPUT): Added plugins/python-loader/Makefile,
plugins/gnome-glossary/Makefile, plugins/py-func/Makefile.
Fixed Python configuration.
* plugins/Makefile.am:
Conditionally added plugins: python-loader, py-func, gnome-glossary.
2001-03-05 Zbigniew Chyla <cyba@gnome.pl> 2001-03-05 Zbigniew Chyla <cyba@gnome.pl>
Fixes #51316 (actually, it fixes the _real_ problem). Fixes #51316 (actually, it fixes the _real_ problem).
......
...@@ -159,15 +159,15 @@ dnl ************************************************** ...@@ -159,15 +159,15 @@ dnl **************************************************
dnl * Check for Python dnl * Check for Python
dnl ************************************************** dnl **************************************************
try_python=true try_python=true
python_val=false
AC_ARG_WITH(python, AC_ARG_WITH(python,
[--{with,without}-python Compile the Python plugin], [--{with,without}-python Compile the Python plugin loader],
if test x$withval = xno; then if test x$withval = xno; then
try_python=false try_python=false
fi fi
) )
if $try_python; then if $try_python; then
python_val=
AC_CHECK_PROG(python_val, python, true, false) AC_CHECK_PROG(python_val, python, true, false)
if $python_val; then if $python_val; then
PY_PREFIX=`python -c 'import sys ; print sys.prefix'` PY_PREFIX=`python -c 'import sys ; print sys.prefix'`
...@@ -192,8 +192,10 @@ if $try_python; then ...@@ -192,8 +192,10 @@ if $try_python; then
python_val=false python_val=false
fi fi
fi fi
AM_CONDITIONAL(WITH_PYTHON, $python_val)
else
AM_CONDITIONAL(WITH_PYTHON, false)
fi fi
AM_CONDITIONAL(WITH_PYTHON, $python_val)
dnl Check for libole2 dnl Check for libole2
AC_MSG_CHECKING(for libole2 >= 0.1.7 ) AC_MSG_CHECKING(for libole2 >= 0.1.7 )
...@@ -547,6 +549,9 @@ plugins/gb/Makefile ...@@ -547,6 +549,9 @@ plugins/gb/Makefile
plugins/lotus-123/Makefile plugins/lotus-123/Makefile
plugins/oleo/Makefile plugins/oleo/Makefile
plugins/python/Makefile plugins/python/Makefile
plugins/python-loader/Makefile
plugins/gnome-glossary/Makefile
plugins/py-func/Makefile
plugins/perl/Makefile plugins/perl/Makefile
plugins/perl/ext/Makefile.PL plugins/perl/ext/Makefile.PL
plugins/guile/Makefile plugins/guile/Makefile
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
# a static libpython are resolved. # a static libpython are resolved.
if WITH_PYTHON if WITH_PYTHON
PYTHON_DIR = python PYTHON_DIR = python
PYTHON_LOADER_DIR = python-loader
PYFUNC_DIR = py-func
GNOME_GLOSSARY_DIR = gnome-glossary
else else
PYTHON_DIR = PYTHON_DIR =
PYTHON_LOADER_DIR =
PYFUNC_DIR =
GNOME_GLOSSARY_DIR =
endif endif
if WITH_PERL if WITH_PERL
...@@ -31,9 +37,11 @@ GDA_DIR= ...@@ -31,9 +37,11 @@ GDA_DIR=
endif endif
SUBDIRS_FILE_FORMATS = excel lotus-123 oleo sc sylk xbase html dif plan-perfect \ SUBDIRS_FILE_FORMATS = excel lotus-123 oleo sc sylk xbase html dif plan-perfect \
xml2 applix xml2 applix $(GNOME_GLOSSARY_DIR)
SUBDIRS_FUNCTIONS = $(PYTHON_DIR) $(PERL_DIR) $(GUILE_DIR) $(GB_DIR) \ SUBDIRS_FUNCTIONS = $(PYTHON_DIR) $(PERL_DIR) $(GUILE_DIR) $(GB_DIR) \
numtheory $(GDA_DIR) numtheory $(GDA_DIR) $(PYFUNC_DIR)
SUBDIRS = $(SUBDIRS_FILE_FORMATS) $(SUBDIRS_FUNCTIONS) SUBDIRS_LOADERS = $(PYTHON_LOADER_DIR)
SUBDIRS = $(SUBDIRS_FILE_FORMATS) $(SUBDIRS_FUNCTIONS) $(SUBDIRS_LOADERS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment