diff options
| author | James Henstridge <james@daa.com.au> | 2002-12-24 06:33:08 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2002-12-24 06:33:08 +0000 |
| commit | a82ffae9b72fd8db9488dab2d80f1a30995b5783 (patch) | |
| tree | b4852855b844f4d4a439aa6cb3230e3fd86ad1a6 /autogen.sh | |
| parent | 2d26e718f71378183f0713863a4daa8bffe100ff (diff) | |
| download | pygtk-a82ffae9b72fd8db9488dab2d80f1a30995b5783.tar.gz | |
use automake-1.7 in preference to 1.6.
2002-12-23 James Henstridge <james@daa.com.au>
* autogen.sh (AUTOMAKE): use automake-1.7 in preference to 1.6.
* configure.in (GLIB_LIBS): remove -export-dynamic from flags.
2002-12-23 James Henstridge <james@daa.com.au>
* configure.in (PYORBIT_LIBS): add code to get rid of the
"-export-dynamic" from the link flags, since we want to limit the
number of exported symbols.
* autogen.sh (AUTOMAKE): allow building with automake 1.7 or 1.6.
* src/ORBitmodule.c (add_tc_constants): new function to add
CORBA.TC_* constants.
2002-12-23 James Henstridge <james@daa.com.au>
* configure.in (PYORBIT_LIBS): add code to get rid of the
"-export-dynamic" from the link flags, since we want to limit the
number of exported symbols.
* autogen.sh (AUTOMAKE): allow building with automake 1.7 or 1.6.
* src/ORBitmodule.c (add_tc_constants): new function to add
CORBA.TC_* constants.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -12,8 +12,6 @@ FILE=gtk DIE=0 -test -z "$AUTOMAKE" && AUTOMAKE=automake-1.6 -test -z "$ACLOCAL" && ACLOCAL=aclocal-1.6 test -z "$AUTOCONF" && AUTOCONF=autoconf test -z "$AUTOHEADER" && AUTOHEADER=autoheader @@ -27,19 +25,27 @@ test -z "$AUTOHEADER" && AUTOHEADER=autoheader (libtool --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have libtool installed to compile gnome-xml." + echo "You must have libtool installed to compile $PROJECT." echo "Get ftp://ftp.gnu.org/gnu/libtool/libtool-1.4.tar.gz" echo "(or a newer version if it is available)" DIE=1 } -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} +if test -z "$AUTOMAKE"; then + if automake-1.7 --version < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.7 + ACLOCAL=aclocal-1.7 + elif automake-1.6 --version < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.6 + ACLOCAL=aclocal-1.6 + else + echo + echo "You must have automake installed to compile $PROJECT." + echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.2.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + fi +fi if test "$DIE" -eq 1; then exit 1 |