← Back to branch summary

~ubuntu-branches/ubuntu/quantal/glom/quantal

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2009-01-11 17:12:01 UTC
  • mfrom: (1.1.39 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111171201-0ov9zh1fxfueshxc
Tags: 1.8.5-0ubuntu1
https://launchpad.net/bugs/256701
https://launchpad.net/bugs/309147
https://launchpad.net/bugs/303453
https://launchpad.net/bugs/303422
https://launchpad.net/bugs/303425
https://launchpad.net/bugs/299573
https://launchpad.net/bugs/306593
https://launchpad.net/bugs/299549
https://launchpad.net/bugs/299556
https://launchpad.net/bugs/299591
https://launchpad.net/bugs/299853
https://launchpad.net/bugs/299896
https://launchpad.net/bugs/300054
https://launchpad.net/bugs/300057
https://launchpad.net/bugs/300819
* New upstream release (LP: #256701), fixes LP bugs: 
  + Clear the text in property dialogs for text items (LP: #309147)
  + Don't crash when showing and then hiding the grid (LP: #303453)
  + Temporarily remember the sort order so it is the same when navigating 
    away and back (LP: #303422)
  + Use the list's sort order for the top-level records in the report 
    (LP: #303425)
  + Users/Groups: Disable drag-and-drop for the treeview, because it is
    useless and confusing (LP: #299573)
  + Import: Sort the fields list alphabetically (LP: #306593)
  + delete primary key make unusuable the database (LP: #299549)
  + Spanish translate incomplete (LP: #299556)
  + import date format error (LP: #299591)
  + can't delete data from table list view (LP: #299853)
  + Field definition: default value not saved (LP: #299896)
  + reports crashing (LP: #300054)
  + Year error with date fields (LP: #300057)
  + list view: 2 records added instead of 1 (LP: #300819)
* debian/control: Refreshed dependencies for libglom-dev.
* debian/control: Updated build-deps to match configure checks. goocavnasmm
  build-dep bumped to version without .la files.
* debian/rules: Don't delete the directory containing the templates.
* debian/control, debian/rules, debian/glom-doc.*: Split out
  arch-independent manual and examples into separate package glom-doc, which
  is now recommended by glom (glom will still work if they're not available)
* debian/copyright: Rewritten to new machine-readable format. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
63
63
        # This bit is copied from Planner. murrayc.
64
64
        # Check for Python library path
65
65
        AC_MSG_CHECKING([for Python library path])
66
 
        python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
 
66
 
 
67
        # Win32 has libpython25.a instead of libpython2.5.a, so we look
 
68
        # for both. TODO: Only look for libpython25.a on Windows, and for
 
69
        # libpython2.5.a on unix.
 
70
        WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
 
71
 
 
72
        python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
67
73
        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
68
 
                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
69
 
                if test -n "$python_path" ; then
70
 
                        break
71
 
                fi
 
74
                if test -e "$i"; then
 
75
                        python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
 
76
                        if test -n "$python_path" ; then
 
77
                                python_lib="python$PYTHON_VERSION"
 
78
                                break
 
79
                        fi
 
80
 
 
81
                        # Additionally test WIN32_PYTHON_VERSION
 
82
                        python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
 
83
                        if test -n "$python_path" ; then
 
84
                                python_lib="python$WIN32_PYTHON_VERSION"
 
85
                                break
 
86
                        fi
 
87
                fi
72
88
        done
 
89
 
73
90
        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
74
91
        AC_MSG_RESULT([$python_path])
75
92
        if test -z "$python_path" ; then
76
93
                AC_MSG_ERROR([cannot find Python library path])
77
94
        fi
78
 
        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
 
95
        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
79
96
        
80
97
])
81
98