matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc fixes to infrastructure: adjourn gettext version and 

some m4 macros


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1328 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2008-11-08 20:01:09 +00:00
parent d609d30e37
commit 61df7cd551
9 changed files with 907 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -70,7 +70,7 @@ CLEANFILES =
# #
# ############################################################ # ############################################################
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 --install
install_macros = \ install_macros = \
m4/sgpemv2-dirs.m4 m4/sgpemv2-dirs.m4

3
autogen.sh
View File

@ -3,11 +3,12 @@
# Changelog from SVN (svn2cl) # Changelog from SVN (svn2cl)
if [ -d .svn ]; then if [ -d .svn ]; then
if [ "x$no_log" != "x1" ]; then if [ "x$no_log" != "x1" ]; then
# only recreate if we in svn repository # only recreate if we're in svn repository
echo "*info* creating ChangeLog from SVN history" echo "*info* creating ChangeLog from SVN history"
sh ./config/svn2cl.sh sh ./config/svn2cl.sh
curdir=`pwd` curdir=`pwd`
for i in plugins/*; do for i in plugins/*; do
echo "Entering also in directory: ${i}"
cd "${i}" && sh ../../config/svn2cl.sh cd "${i}" && sh ../../config/svn2cl.sh
cd ${curdir} cd ${curdir}
done done

7
configure.ac
View File

@ -37,7 +37,8 @@ if test -f "`pwd`/configure.ac"; then
fi fi
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
@ -50,9 +51,9 @@ AH_TOP([#if not defined PACKAGE])
AH_BOTTOM([#endif]) AH_BOTTOM([#endif])
dnl gettext & libtool dnl gettext & libtool
AC_PROG_LIBTOOL LT_INIT
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.17])
dnl various requisites dnl various requisites
SIGCPP_VERSION=2.0.10 SIGCPP_VERSION=2.0.10

2
plugins/pyloader/Makefile.am
View File

@ -47,7 +47,7 @@ CLEANFILES =
# #
# ############################################################ # ############################################################
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 --install
macros = m4/compilerflags.m4 \ macros = m4/compilerflags.m4 \
m4/linkingflags.m4 \ m4/linkingflags.m4 \

9
plugins/pyloader/configure.ac
View File

@ -20,7 +20,7 @@
dnl ----------------- CONFIGURE --------------------- dnl ----------------- CONFIGURE ---------------------
AC_INIT([sgpemv2-pyloader],[1.0],[matteo@member.fsf.org]) AC_INIT([sgpemv2-pyloader],[1.1],[matteo@member.fsf.org])
if test -f "`pwd`/configure.ac"; then if test -f "`pwd`/configure.ac"; then
AC_MSG_FAILURE([ AC_MSG_FAILURE([
@ -37,7 +37,8 @@ if test -f "`pwd`/configure.ac"; then
fi fi
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
@ -45,9 +46,9 @@ dnl starting automake
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects]) AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
dnl gettext & libtool dnl gettext & libtool
AC_PROG_LIBTOOL LT_INIT
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.17])
dnl PYTHON_VERSION is declared precious by AC_PYTHON_DEVEL, dnl PYTHON_VERSION is declared precious by AC_PYTHON_DEVEL,
dnl so don't use it here dnl so don't use it here

18
plugins/pyloader/m4/ac_python_devel.m4
View File

@ -236,20 +236,24 @@ $ac_distutils_result])
# final check to see if everything compiles alright # final check to see if everything compiles alright
# #
AC_MSG_CHECKING([consistency of all components of python development environment]) AC_MSG_CHECKING([consistency of all components of python development environment])
AC_LANG_PUSH([C])
# save current global flags # save current global flags
LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
AC_TRY_LINK([ AC_LANG_PUSH([C])
AC_TRY_LINK(AC_LANG_PROGRAM([
#include <Python.h> #include <Python.h>
],[ ],[
Py_Initialize(); Py_Initialize();
],[pythonexists=yes],[pythonexists=no]) ]),[pythonexists=yes],[pythonexists=no])
AC_LANG_POP([C])
# turn back to default flags
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
AC_MSG_RESULT([$pythonexists]) AC_MSG_RESULT([$pythonexists])
if test ! "$pythonexists" = "yes"; then if test ! "x$pythonexists" = "xyes"; then
AC_MSG_ERROR([ AC_MSG_FAILURE([
Could not link test program to Python. Maybe the main Python library has been Could not link test program to Python. Maybe the main Python library has been
installed in some non-standard library path. If so, pass it to configure, installed in some non-standard library path. If so, pass it to configure,
via the LDFLAGS environment variable. via the LDFLAGS environment variable.
@ -262,10 +266,6 @@ $ac_distutils_result])
]) ])
PYTHON_VERSION="" PYTHON_VERSION=""
fi fi
AC_LANG_POP
# turn back to default flags
CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
# #
# all done! # all done!

1326
plugins/xmlsave/ABOUT-NLS
View File

File diff suppressed because it is too large Load Diff

2
plugins/xmlsave/Makefile.am
View File

@ -46,7 +46,7 @@ CLEANFILES =
# #
# ############################################################ # ############################################################
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 --install
macros = m4/compilerflags.m4 \ macros = m4/compilerflags.m4 \
m4/linkingflags.m4 \ m4/linkingflags.m4 \

7
plugins/xmlsave/configure.ac
View File

@ -20,7 +20,7 @@
dnl ----------------- CONFIGURE --------------------- dnl ----------------- CONFIGURE ---------------------
AC_INIT([sgpemv2-xmlsave],[1.0],[matteo@member.fsf.org]) AC_INIT([sgpemv2-xmlsave],[1.1],[matteo@member.fsf.org])
if test -f "`pwd`/configure.ac"; then if test -f "`pwd`/configure.ac"; then
AC_MSG_FAILURE([ AC_MSG_FAILURE([
@ -37,7 +37,8 @@ if test -f "`pwd`/configure.ac"; then
fi fi
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
@ -47,7 +48,7 @@ AM_INIT_AUTOMAKE([dejagnu dist-bzip2 subdir-objects])
dnl gettext & libtool dnl gettext & libtool
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.17])
dnl PYTHON_VERSION is declared precious by AC_PYTHON_DEVEL, dnl PYTHON_VERSION is declared precious by AC_PYTHON_DEVEL,
dnl so don't use it here dnl so don't use it here