diff --git a/ChangeLog b/ChangeLog index 1f6276f..2cfb917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,2 +1,37 @@ +2006-01-13 gettextize + + * m4/codeset.m4: New file, from gettext-0.14.5. + * m4/gettext.m4: New file, from gettext-0.14.5. + * m4/glibc2.m4: New file, from gettext-0.14.5. + * m4/glibc21.m4: New file, from gettext-0.14.5. + * m4/iconv.m4: New file, from gettext-0.14.5. + * m4/intdiv0.m4: New file, from gettext-0.14.5. + * m4/intmax.m4: New file, from gettext-0.14.5. + * m4/inttypes.m4: New file, from gettext-0.14.5. + * m4/inttypes_h.m4: New file, from gettext-0.14.5. + * m4/inttypes-pri.m4: New file, from gettext-0.14.5. + * m4/isc-posix.m4: New file, from gettext-0.14.5. + * m4/lcmessage.m4: New file, from gettext-0.14.5. + * m4/lib-ld.m4: New file, from gettext-0.14.5. + * m4/lib-link.m4: New file, from gettext-0.14.5. + * m4/lib-prefix.m4: New file, from gettext-0.14.5. + * m4/longdouble.m4: New file, from gettext-0.14.5. + * m4/longlong.m4: New file, from gettext-0.14.5. + * m4/nls.m4: New file, from gettext-0.14.5. + * m4/po.m4: New file, from gettext-0.14.5. + * m4/printf-posix.m4: New file, from gettext-0.14.5. + * m4/progtest.m4: New file, from gettext-0.14.5. + * m4/signed.m4: New file, from gettext-0.14.5. + * m4/size_max.m4: New file, from gettext-0.14.5. + * m4/stdint_h.m4: New file, from gettext-0.14.5. + * m4/uintmax_t.m4: New file, from gettext-0.14.5. + * m4/ulonglong.m4: New file, from gettext-0.14.5. + * m4/wchar_t.m4: New file, from gettext-0.14.5. + * m4/wint_t.m4: New file, from gettext-0.14.5. + * m4/xsize.m4: New file, from gettext-0.14.5. + * m4/Makefile.am (EXTRA_DIST): New variable. + * Makefile.am (EXTRA_DIST): Add config/config.rpath, config/mkinstalldirs. + * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in. + 2005, December 30th Matteo Settenvini * Lay out autotools foundations diff --git a/Makefile.am b/Makefile.am index 881156b..e43b260 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,8 @@ # along with SGPEMv2; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = doc m4 +SUBDIRS = doc m4 po -EXTRA_DIST = configure.ac +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = config/config.rpath config/mkinstalldirs configure.ac diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 index 3bb71f7..e1d6592 --- a/autogen.sh +++ b/autogen.sh @@ -1,2 +1,2 @@ #!/bin/sh -autoreconf -i --warnings=all -v +autoreconf -i --warnings=all -B m4 -v diff --git a/configure.ac b/configure.ac index 0d7cf06..7604343 100644 --- a/configure.ac +++ b/configure.ac @@ -44,37 +44,51 @@ AC_CANONICAL_TARGET dnl starting automake AM_INIT_AUTOMAKE( [$PACKAGE_NAME], [$PACKAGE_VERSION] ) +dnl gettext & libtool +AC_PROG_LIBTOOL +AM_GNU_GETTEXT([external]) + dnl various requisites -#GTKMM_VERSION=2.8.0 -#CAIRO_VERSION=1.0.0 +GTKMM_VERSION=2.8.0 +CAIRO_VERSION=1.0.0 dnl c++ compiler and flags -#AC_PROG_CXX -#AC_CHECK_CXXFLAG([Wall]) -#AC_CHECK_CXXFLAG([pedantic]) -#AC_CHECK_CXXFLAG([Wextra]) +AC_PROG_CXX +AC_CHECK_CXXFLAG([Wall]) +AC_CHECK_CXXFLAG([pedantic]) +AC_CHECK_CXXFLAG([Wextra]) AC_PROG_INSTALL dnl make AC_PROG_MAKE_SET +dnl check for python and SWIG +AC_PYTHON_DEVEL +AC_PROG_SWIG +SWIG_ENABLE_CXX +SWIG_PYTHON + dnl check for gtkmm & cairo -#PKG_CHECK_MODULES([CAIRO], -# [cairo >= $CAIRO_VERSION], -# :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) -#PKG_CHECK_MODULES([GTKMM], -# [gtkmm-2.4 >= $GTKMM_VERSION], -# :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) -#PKG_CHECK_MODULES([GTHREAD], -# [gthread-2.0 >= $GTKMM_VERSION], -# :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) +PKG_CHECK_MODULES([CAIRO], + [cairo >= $CAIRO_VERSION], + :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) +PKG_CHECK_MODULES([GTKMM], + [gtkmm-2.4 >= $GTKMM_VERSION], + :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) +PKG_CHECK_MODULES([GLIB], + [glibmm-2.4 >= $GTKMM_VERSION], + :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) +PKG_CHECK_MODULES([GTHREAD], + [gthread-2.0 >= $GTKMM_VERSION], + :, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS])) AC_CONFIG_HEADERS([config.h:config.h.in]) -AC_CONFIG_FILES([ +AC_CONFIG_FILES([ Makefile doc/Makefile m4/Makefile +po/Makefile.in ]) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c60ba0..eb8e50b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -18,7 +18,7 @@ # along with SGPEMv2; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -info_TEXINFOS = sgpem2.texi sgpem2uman.texi sgpem2dman.texi +info_TEXINFOS = sgpem2uman.texi sgpem2dman.texi licenses = fdl.texi gpl.texi diff --git a/doc/sgpem2.texi b/doc/sgpem2.texi deleted file mode 100644 index a7f78c5..0000000 --- a/doc/sgpem2.texi +++ /dev/null @@ -1,20 +0,0 @@ -\input texinfo @c -*-texinfo-*- - -@c %**start of header -@setfilename sgpem2.info -@settitle SGPEM v2 Manuals -@include version.texi -@c %**end of header - -@c % -------------------------------------------------- - -@dircategory SGPEM v2 -@direntry -* SGPEM v2 User Manual : (sgpem2uman) Learn how to operate SGPEM v2 -* SGPEM v2 Developer Manual : (sgpem2dman) Learn how to contribute to -SGPEM development -@end direntry - -@c % -------------------------------------------------- - -@bye diff --git a/doc/sgpem2dman.texi b/doc/sgpem2dman.texi index fe2ec65..275d336 100644 --- a/doc/sgpem2dman.texi +++ b/doc/sgpem2dman.texi @@ -6,10 +6,15 @@ @include vers-dman.texi @c %**end of header +@dircategory SGPEM v2 - A Process Scheduling Simulator +@direntry +* Developers: (sgpem2dman)Top +@end direntry + @c % -------------------------------------------------- @copying -This is SGPEMv2 Manual (version @value{VERSION}, +This is SGPEMv2 Developer Manual (version @value{VERSION}, @value{UPDATED}). Copyright @copyright{} 2005 University of Padova, dept. of Pure @@ -51,7 +56,7 @@ Free Documentation License''. @ifnottex @node Top, History, (none), (dir) -@top SGPEMv2 Developer Manual +@top How to contribute to development @insertcopying @end ifnottex @@ -343,12 +348,12 @@ Doxygen-like syntax. The payback will be high, I assure you. @item -Class names are -composed of capitalized words. +Class names are composed of UpperCamelCase words. Member functions are composed of -capitalized words @strong{except} for the very -first letter. -Member data are lowercase words (sometimes +lowercase words @strong{except}, separated by +an underscore, since both the STL and Gtk-- use +this convention. +Member data are lowercase words (can be separated by an underscore). Enums members are lowercase and they have a prefix that tells something about their diff --git a/doc/sgpem2uman.texi b/doc/sgpem2uman.texi index 22564f8..9d24c45 100644 --- a/doc/sgpem2uman.texi +++ b/doc/sgpem2uman.texi @@ -6,10 +6,15 @@ @include vers-uman.texi @c %**end of header +@dircategory SGPEM v2 - A Process Scheduling Simulator +@direntry +* Users: (sgpem2uman)Top +@end direntry + @c % -------------------------------------------------- @copying -This is SGPEMv2 Manual (version @value{VERSION}, +This is SGPEMv2 User Manual (version @value{VERSION}, @value{UPDATED}). Copyright @copyright{} 2005 University of Padova, dept. of Pure @@ -51,7 +56,7 @@ Free Documentation License''. @ifnottex @node Top, History, (none), (dir) -@top SGPEM v2 User Manual +@top Learn how to operate SGPEMv2 @insertcopying @end ifnottex diff --git a/gettext.h b/gettext.h new file mode 100644 index 0000000..fcd2d13 --- /dev/null +++ b/gettext.h @@ -0,0 +1,83 @@ +/* Convenience header for conditional use of GNU . + Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +#ifndef _LIBGETTEXT_H +#define _LIBGETTEXT_H 1 + +/* NLS can be disabled through the configure --disable-nls option. */ +#if ENABLE_NLS + +/* Get declarations of GNU message catalog functions. */ +# include + +#else + +/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which + chokes if dcgettext is defined as a macro. So include it now, to make + later inclusions of a NOP. We don't include + as well because people using "gettext.h" will not include , + and also including would fail on SunOS 4, whereas + is OK. */ +#if defined(__sun) +# include +#endif + +/* Many header files from the libstdc++ coming with g++ 3.3 or newer include + , which chokes if dcgettext is defined as a macro. So include + it now, to make later inclusions of a NOP. */ +#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) +# include +# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H +# include +# endif +#endif + +/* Disabled NLS. + The casts to 'const char *' serve the purpose of producing warnings + for invalid uses of the value returned from these functions. + On pre-ANSI systems without 'const', the config.h file is supposed to + contain "#define const". */ +# define gettext(Msgid) ((const char *) (Msgid)) +# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) +# define ngettext(Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dngettext(Domainname, Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define textdomain(Domainname) ((const char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) + +#endif + +/* A pseudo function call that serves as a marker for the automated + extraction of messages, but does not call gettext(). The run-time + translation is done at a different place in the code. + The argument, String, should be a literal string. Concatenated strings + and other string expressions won't work. + The macro's expansion is not parenthesized, so that it is suitable as + initializer for static 'char[]' or 'const char[]' variables. */ +#define gettext_noop(String) String + +/* Commodity macros -- added by Matteo Settenvini 2006-01-13 */ +#define _(x) (gettext(x)) +#define N_(x) (gettext_noop(x)) + +#endif /* _LIBGETTEXT_H */ diff --git a/m4/Makefile.am b/m4/Makefile.am index b9d80ed..e616c88 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -19,5 +19,12 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -aclocaldir = $(datadir)/aclocal -aclocal_DATA = compilerflags.m4 +# aclocaldir = $(datadir)/aclocal +# better if we don't install our macros... +# -> aclocal_DATA = ... +noinst_DATA = compilerflags.m4 \ + ac_python_devel.m4 \ + ac_pkg_swig.m4 \ + ac_python_module.m4 + +EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 diff --git a/m4/ac_pkg_swig.m4 b/m4/ac_pkg_swig.m4 new file mode 100644 index 0000000..c627a74 --- /dev/null +++ b/m4/ac_pkg_swig.m4 @@ -0,0 +1,155 @@ +dnl @synopsis AC_PROG_SWIG([major.minor.micro]) +dnl +dnl This macro searches for a SWIG installation on your system. If +dnl found you should call SWIG via $(SWIG). You can use the optional +dnl first argument to check if the version of the available SWIG is +dnl greater than or equal to the value of the argument. It should have +dnl the format: N[.N[.N]] (N is a number between 0 and 999. Only the +dnl first N is mandatory.) +dnl +dnl If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks +dnl that the swig package is this version number or higher. +dnl +dnl In configure.in, use as: +dnl +dnl AC_PROG_SWIG(1.3.17) +dnl SWIG_ENABLE_CXX +dnl SWIG_MULTI_MODULE_SUPPORT +dnl SWIG_PYTHON +dnl +dnl @category InstalledPackages +dnl @author Sebastian Huber +dnl @author Alan W. Irwin +dnl @author Rafael Laboissiere +dnl @author Andrew Collier +dnl @version 2004-09-20 +dnl @license GPLWithACException + +AC_DEFUN([AC_PROG_SWIG],[ + AC_PATH_PROG([SWIG],[swig]) + if test -z "$SWIG" ; then + AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org]) + SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' + elif test -n "$1" ; then + AC_MSG_CHECKING([for SWIG version]) + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] + AC_MSG_RESULT([$swig_version]) + if test -n "$swig_version" ; then + # Calculate the required version number components + [required=$1] + [required_major=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_major" ; then + [required_major=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_minor=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_minor" ; then + [required_minor=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_patch=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_patch" ; then + [required_patch=0] + fi + # Calculate the available version number components + [available=$swig_version] + [available_major=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_major" ; then + [available_major=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_minor=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_minor" ; then + [available_minor=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_patch=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_patch" ; then + [available_patch=0] + fi + if test $available_major -ne $required_major \ + -o $available_minor -ne $required_minor \ + -o $available_patch -lt $required_patch ; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) + SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' + else + AC_MSG_NOTICE([SWIG executable is '$SWIG']) + SWIG_LIB=`$SWIG -swiglib` + AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB']) + fi + else + AC_MSG_WARN([cannot determine SWIG version]) + SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' + fi + fi + AC_SUBST([SWIG_LIB]) +]) + +# SWIG_ENABLE_CXX() +# +# Enable SWIG C++ support. This affects all invocations of $(SWIG). +AC_DEFUN([SWIG_ENABLE_CXX],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PROG_CXX]) + SWIG="$SWIG -c++" +]) + +# SWIG_MULTI_MODULE_SUPPORT() +# +# Enable support for multiple modules. This effects all invocations +# of $(SWIG). You have to link all generated modules against the +# appropriate SWIG runtime library. If you want to build Python +# modules for example, use the SWIG_PYTHON() macro and link the +# modules against $(SWIG_PYTHON_LIBS). +# +AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[ + AC_REQUIRE([AC_PROG_SWIG]) + SWIG="$SWIG -noruntime" +]) + +# SWIG_PYTHON([use-shadow-classes = {no, yes}]) +# +# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), +# and $(SWIG_PYTHON_OPT) output variables. +# +# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate +# code for Python. Shadow classes are enabled unless the value of the +# optional first argument is exactly 'no'. If you need multi module +# support (provided by the SWIG_MULTI_MODULE_SUPPORT() macro) use +# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It +# contains the SWIG Python runtime library that is needed by the type +# check system for example. +AC_DEFUN([SWIG_PYTHON],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PYTHON_DEVEL]) + test "x$1" != "xno" || swig_shadow=" -noproxy" + AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow]) + AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) +]) + + +dnl @synopsis AC_LIB_WAD +dnl +dnl This macro searches for installed WAD library. +dnl +AC_DEFUN([AC_LIB_WAD], +[ + AC_REQUIRE([AC_PYTHON_DEVEL]) + AC_ARG_ENABLE(wad, + AC_HELP_STRING([--enable-wad], [enable wad module]), + [ + case "${enableval}" in + no) ;; + *) if test "x${enableval}" = xyes; + then + check_wad="yes" + fi ;; + esac + ], []) + + if test -n "$check_wad"; + then + AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS) + AC_SUBST(WADPY) + fi +]) diff --git a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4 new file mode 100644 index 0000000..bf30614 --- /dev/null +++ b/m4/ac_python_devel.m4 @@ -0,0 +1,76 @@ +dnl @synopsis AC_PYTHON_DEVEL +dnl +dnl Checks for Python and tries to get the include path to 'Python.h'. +dnl It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) output +dnl variables. +dnl It also exports $(PYTHON_EXTRA_LIBS) and $(PYTHON_EXTRA_LDFLAGS) +dnl for embedding Python in your code. +dnl +dnl @category InstalledPackages +dnl @author Sebastian Huber +dnl @author Alan W. Irwin +dnl @author Rafael Laboissiere +dnl @author Andrew Collier +dnl @author Matteo Settenvini +dnl @version 2006-01-13 +dnl @license GPLWithACException + +AC_DEFUN([AC_PYTHON_DEVEL],[ + # + # should allow for checking of python version here... + # + AC_REQUIRE([AM_PATH_PYTHON]) + + # Check for Python include path + AC_MSG_CHECKING([for Python include path]) + python_path=`echo $PYTHON | sed "s,/bin.*$,,"` + for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do + python_path=`find $i -type f -name Python.h -print | sed "1q"` + if test -n "$python_path" ; then + break + fi + done + python_path=`echo $python_path | sed "s,/Python.h$,,"` + AC_MSG_RESULT([$python_path]) + if test -z "$python_path" ; then + AC_MSG_ERROR([cannot find Python include path]) + fi + AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path]) + + # Check for Python library path + AC_MSG_CHECKING([for Python library path]) + python_path=`echo $PYTHON | sed "s,/bin.*$,,"` + for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do + python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` + if test -n "$python_path" ; then + break + fi + done + python_path=`echo $python_path | sed "s,/libpython.*$,,"` + AC_MSG_RESULT([$python_path]) + if test -z "$python_path" ; then + AC_MSG_ERROR([cannot find Python library path]) + fi + AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"]) + # + python_site=`echo $python_path | sed "s/config/site-packages/"` + AC_SUBST([PYTHON_SITE_PKG],[$python_site]) + # + # libraries which must be linked in when embedding + # + AC_MSG_CHECKING(python extra libraries) + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print conf('LOCALMODLIBS')+' '+conf('LIBS')"` + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) + AC_SUBST(PYTHON_EXTRA_LIBS) + # + # linking flags needed when embedding + # + AC_MSG_CHECKING(python extra linking flags) + PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print conf('LINKFORSHARED')"` + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) + AC_SUBST(PYTHON_EXTRA_LDFLAGS) +]) diff --git a/m4/ac_python_module.m4 b/m4/ac_python_module.m4 new file mode 100644 index 0000000..32b9d72 --- /dev/null +++ b/m4/ac_python_module.m4 @@ -0,0 +1,30 @@ +dnl @synopsis AC_PYTHON_MODULE(modname[, fatal]) +dnl +dnl Checks for Python module. +dnl +dnl If fatal is non-empty then absence of a module will trigger an +dnl error. +dnl +dnl @category InstalledPackages +dnl @author Andrew Collier . +dnl @version 2004-07-14 +dnl @license AllPermissive + +AC_DEFUN([AC_PYTHON_MODULE],[ + AC_MSG_CHECKING(python module: $1) + python -c "import $1" 2>/dev/null + if test $? -eq 0; + then + AC_MSG_RESULT(yes) + eval AS_TR_CPP(HAVE_PYMOD_$1)=yes + else + AC_MSG_RESULT(no) + eval AS_TR_CPP(HAVE_PYMOD_$1)=no + # + if test -n "$2" + then + AC_MSG_ERROR(failed to find required module $1) + exit 1 + fi + fi +]) diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 0000000..51eb3f3 --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,12 @@ +2006-01-13 gettextize + + * Makefile.in.in: New file, from gettext-0.14.5. + * boldquot.sed: New file, from gettext-0.14.5. + * en@boldquot.header: New file, from gettext-0.14.5. + * en@quot.header: New file, from gettext-0.14.5. + * insert-header.sin: New file, from gettext-0.14.5. + * quot.sed: New file, from gettext-0.14.5. + * remove-potcdate.sin: New file, from gettext-0.14.5. + * Rules-quot: New file, from gettext-0.14.5. + * POTFILES.in: New file. + diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..b2d6a8b --- /dev/null +++ b/po/Makevars @@ -0,0 +1,41 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = University of Padova, dept. of Pure and Applied Mathematics + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = matteo@member.fsf.org + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..535e849 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,6 @@ +# List of source files which contain translatable strings. + +# src/pippo.cc +# src/pluto.cc +# ... +