diff --git a/configure b/configure index 515ca9e0b..eb8b24655 100755 --- a/configure +++ b/configure @@ -603,6 +603,8 @@ PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -634,7 +636,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:638: checking for a BSD compatible install" >&5 +echo "configure:640: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -687,7 +689,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:691: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:693: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -717,7 +719,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:721: checking for $ac_word" >&5 +echo "configure:723: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +749,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:751: checking for $ac_word" >&5 +echo "configure:753: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -798,7 +800,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:802: checking for $ac_word" >&5 +echo "configure:804: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -830,7 +832,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:836: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -841,12 +843,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 845 "configure" +#line 847 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -872,12 +874,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:876: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:881: checking whether we are using GNU C" >&5 +echo "configure:883: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +888,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -905,7 +907,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:909: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:911: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,11 +939,208 @@ else fi +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:944: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + +ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 +echo "configure:1025: checking for libintl.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + +echo $ac_n "checking for textdomain in -lc""... $ac_c" 1>&6 +echo "configure:1058: checking for textdomain in -lc" >&5 +ac_lib_var=`echo c'_'textdomain | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lc $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="" +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 +echo "configure:1096: checking for textdomain in -lintl" >&5 +ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="-lintl" +else + echo "$ac_t""no" 1>&6 +{ echo "configure: error: "Could not find internationalization libraries"" 1>&2; exit 1; } +fi + + +fi + + # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:945: checking for $ac_word" >&5 +echo "configure:1144: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -972,7 +1171,7 @@ GNOMEHELP=`gnome-config --prefix` echo $ac_n "checking Python bindings for sax/xml""... $ac_c" 1>&6 -echo "configure:976: checking Python bindings for sax/xml" >&5 +echo "configure:1175: checking Python bindings for sax/xml" >&5 cat > conftest.py <&6 echo $ac_n "checking Python bindings for gtk+""... $ac_c" 1>&6 -echo "configure:1009: checking Python bindings for gtk+" >&5 +echo "configure:1208: checking Python bindings for gtk+" >&5 cat > conftest.py <&6 echo $ac_n "checking Python bindings for GNOME""... $ac_c" 1>&6 -echo "configure:1035: checking Python bindings for GNOME" >&5 +echo "configure:1234: checking Python bindings for GNOME" >&5 cat > conftest.py <&6 echo $ac_n "checking Python/libglade bindings""... $ac_c" 1>&6 -echo "configure:1061: checking Python/libglade bindings" >&5 +echo "configure:1260: checking Python/libglade bindings" >&5 cat > conftest.py <&6 echo $ac_n "checking Python/GNOME bindings for libglade""... $ac_c" 1>&6 -echo "configure:1087: checking Python/GNOME bindings for libglade" >&5 +echo "configure:1286: checking Python/GNOME bindings for libglade" >&5 cat > conftest.py <&6 echo $ac_n "checking for headers required to compile python extensions""... $ac_c" 1>&6 -echo "configure:1115: checking for headers required to compile python extensions" >&5 +echo "configure:1314: checking for headers required to compile python extensions" >&5 py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" @@ -1283,11 +1482,13 @@ s%@ZIP@%$ZIP%g s%@PYTHON_VERSION@%$PYTHON_VERSION%g s%@PACKAGE@%$PACKAGE%g s%@GNOMEHELP@%$GNOMEHELP%g +s%@INCS@%$INCS%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g +s%@CPP@%$CPP%g s%@HAVE_GNOME_CONFIG@%$HAVE_GNOME_CONFIG%g s%@PYTHON_INCLUDES@%$PYTHON_INCLUDES%g diff --git a/configure.in b/configure.in index ea3c58d6a..794cd2da1 100644 --- a/configure.in +++ b/configure.in @@ -16,12 +16,22 @@ AC_SUBST(PYTHON) AC_SUBST(PYTHON_VERSION) AC_SUBST(PACKAGE) AC_SUBST(GNOMEHELP) +AC_SUBST(LIBS) +AC_SUBST(INCS) AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_CC +AC_CHECK_HEADER(libintl.h) + +AC_CHECK_LIB(c,textdomain,LIBS="", + [ AC_CHECK_LIB(intl,textdomain, + LIBS="-lintl", + AC_MSG_ERROR("Could not find internationalization libraries")) + ]) + dnl Check for programs AC_CHECK_PROG(HAVE_GNOME_CONFIG, gnome-config, "YES", "NO") diff --git a/src/gramps_main.py b/src/gramps_main.py index 2b68d4ad2..093ddc0e4 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -2063,6 +2063,7 @@ def on_spouselist_changed(obj): #------------------------------------------------------------------------- def new_after_edit(epo): database.addPerson(epo.person) + change_active_person(epo.person) redisplay_person_list(epo.person) #------------------------------------------------------------------------- diff --git a/src/locale/de/LC_MESSAGES/gramps.mo b/src/locale/de/LC_MESSAGES/gramps.mo index dd80be5b3..446b62c3c 100644 Binary files a/src/locale/de/LC_MESSAGES/gramps.mo and b/src/locale/de/LC_MESSAGES/gramps.mo differ diff --git a/src/locale/es/LC_MESSAGES/gramps.mo b/src/locale/es/LC_MESSAGES/gramps.mo index 5c82fa025..a071f0f90 100644 Binary files a/src/locale/es/LC_MESSAGES/gramps.mo and b/src/locale/es/LC_MESSAGES/gramps.mo differ diff --git a/src/locale/sv/LC_MESSAGES/gramps.mo b/src/locale/sv/LC_MESSAGES/gramps.mo index 345936d1c..9b3650c2d 100644 Binary files a/src/locale/sv/LC_MESSAGES/gramps.mo and b/src/locale/sv/LC_MESSAGES/gramps.mo differ diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index daed98240..752e21177 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -351,6 +351,9 @@ class AncestorReport: generation = 0 need_header = 1 + rptOpt.blankDate = reportOptions.No + rptOpt.blankPlace = reportOptions.No + for key in keys : if generation == 0 or key >= 2**generation: if self.pgbrk and generation > 0: diff --git a/src/sort.py b/src/sort.py index d9e8a091a..64701b107 100644 --- a/src/sort.py +++ b/src/sort.py @@ -141,7 +141,7 @@ def by_last_name(first, second) : fsn = string.upper(name1.getSurname()) ssn = string.upper(name2.getSurname()) - if first == second : + if fsn == ssn : ffn = string.upper(name1.getFirstName()) sfn = string.upper(name2.getFirstName()) if ffn == sfn :