svn: r2086
This commit is contained in:
Don Allingham 2003-09-03 04:20:11 +00:00
parent b6788a7fb3
commit 3b3e0a29f6
18 changed files with 65 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2003-09-02 Don Allingham <dallingham@users.sourceforge.net>
* src/po/Makefile.am: convert .po files to unicode before
running through msgfmt
* src/revision.glade: make the open dialog box a bit bigger
2003-09-02 Alex Roitman <shura@alex.neuro.umn.edu> 2003-09-02 Alex Roitman <shura@alex.neuro.umn.edu>
* src/gramps_main.py: Really fix start-up view when family * src/gramps_main.py: Really fix start-up view when family
view style is the default. Clean up the use of views. view style is the default. Clean up the use of views.

View File

@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

42
gramps2/configure vendored
View File

@ -273,7 +273,7 @@ PACKAGE_STRING='gramps 0.9.3'
PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net'
ac_unique_file="src/gramps.py" ac_unique_file="src/gramps.py"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT MSGCONV LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1666,6 +1666,45 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
# Extract the first word of "msgconv", so it can be a program name with args.
set dummy msgconv; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_MSGCONV+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $MSGCONV in
[\\/]* | ?:[\\/]*)
ac_cv_path_MSGCONV="$MSGCONV" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGCONV="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
;;
esac
fi
MSGCONV=$ac_cv_path_MSGCONV
if test -n "$MSGCONV"; then
echo "$as_me:$LINENO: result: $MSGCONV" >&5
echo "${ECHO_T}$MSGCONV" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv"
@ -3946,6 +3985,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t
s,@RELEASE@,$RELEASE,;t t s,@RELEASE@,$RELEASE,;t t
s,@VERSIONSTRING@,$VERSIONSTRING,;t t s,@VERSIONSTRING@,$VERSIONSTRING,;t t
s,@MSGFMT@,$MSGFMT,;t t s,@MSGFMT@,$MSGFMT,;t t
s,@MSGCONV@,$MSGCONV,;t t
s,@LANGUAGES@,$LANGUAGES,;t t s,@LANGUAGES@,$LANGUAGES,;t t
s,@POFILES@,$POFILES,;t t s,@POFILES@,$POFILES,;t t
s,@MOFILES@,$MOFILES,;t t s,@MOFILES@,$MOFILES,;t t

View File

@ -17,6 +17,7 @@ AC_SUBST(RELEASE)
AC_SUBST(VERSIONSTRING) AC_SUBST(VERSIONSTRING)
AC_PATH_PROG(MSGFMT, msgfmt) AC_PATH_PROG(MSGFMT, msgfmt)
AC_PATH_PROG(MSGCONV, msgconv)
LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv"
AC_SUBST(LANGUAGES) AC_SUBST(LANGUAGES)

View File

@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -138,6 +138,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -1,5 +1,5 @@
%define ver 0.9.3 %define ver 0.9.3
%define rel 0.CVS20030820 %define rel 0.CVS20030902
%define prefix /usr %define prefix /usr
%define localstatedir /var/lib %define localstatedir /var/lib
# Ensure that internal RPM macros for configure & makeinstall # Ensure that internal RPM macros for configure & makeinstall

View File

@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -81,6 +81,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -80,6 +80,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@
@ -116,7 +117,6 @@ pkgpython_PYTHON = \
OpenOfficeDoc.py\ OpenOfficeDoc.py\
OpenSpreadSheet.py\ OpenSpreadSheet.py\
PdfDoc.py\ PdfDoc.py\
PdfDrawDoc.py\
PSDrawDoc.py\ PSDrawDoc.py\
RTFDoc.py\ RTFDoc.py\
SvgDrawDoc.py SvgDrawDoc.py

View File

@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@

View File

@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LANGUAGES = @LANGUAGES@ LANGUAGES = @LANGUAGES@
MOFILES = @MOFILES@ MOFILES = @MOFILES@
MSGCONV = @MSGCONV@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
POFILES = @POFILES@ POFILES = @POFILES@
@ -242,7 +243,9 @@ uninstall-local:
done done
.po.mo: .po.mo:
$(MSGFMT) -v $< -o $@ @MSGCONV@ --to-code=UTF-8 $< -o temp.po
$(MSGFMT) -v temp.po -o $@
rm temp.po
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT: