diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | tools-version.sh | 2 |
5 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,12 @@ 2006-07-25 MenTaLguY <mental@rydia.net> + * autogen.sh, configure.ac, debian/control, tools-version.sh: + + un-libtoolize the build process (yay!) -- we haven't actually + used libtool for ages + +2006-07-25 MenTaLguY <mental@rydia.net> + * src/extension/plugin, src/extension/plugin/Makefile_insert, src/extension/plugin/makefile.in, src/extension/plugin/.cvsignore, src/Makefile.am, configure.ac: diff --git a/autogen.sh b/autogen.sh index 5754c4220..2309d7795 100755 --- a/autogen.sh +++ b/autogen.sh @@ -58,7 +58,7 @@ attempt_command () { } echo -echo "I am testing that you have the required versions of libtool, autoconf," +echo "I am testing that you have the required versions of autoconf," echo "automake, glib-gettextize and intltoolize. This test is not foolproof and" echo "if anything goes wrong, there may be guidance in the file HACKING.txt" echo @@ -187,7 +187,6 @@ attempt_command 'underquoted definition of|[\)\#]Extending' \ attempt_command '' autoheader } -attempt_command '' libtoolize --copy --force attempt_command '' $AUTOMAKE --add-missing attempt_command '' autoconf attempt_command '^(Please add the files| codeset| progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \ diff --git a/configure.ac b/configure.ac index 0f2320c4c..37dddfff8 100644 --- a/configure.ac +++ b/configure.ac @@ -48,9 +48,7 @@ AC_HEADER_STDC dnl Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -dnl RANLIB is outdated now -dnl AC_PROG_RANLIB -AM_PROG_LIBTOOL +AC_PROG_RANLIB dnl Verify our GCC version if test "x$GXX" = "xyes"; then diff --git a/debian/control b/debian/control index 3b434542d..852e02d7d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: inkscape Section: graphics Priority: optional Maintainer: Nathan Hurst (njh) <njh@mail.csse.monash.edu.au> -Build-Depends: debhelper (>= 4.0.0), intltool, libart-2.0-dev (>= 2.3.10), libgc-dev (>= 1:6.5-1), libglib2.0-dev, libgnomevfs2-dev, libgtk2.0-dev (>= 2.0.6-1), libglibmm-2.4-dev (>> 2.6.1-1), libgtkmm-2.4-dev (>> 2.4.11-2), libgtkspell-dev (>= 2.0.10-3), libpango1.0-dev, libpng12-dev, libpopt-dev, libsigc++-2.0-dev (>= 2.0.10-3), libtool, libxml-parser-perl, libxml2-dev (>= 2.6.0), libxslt1-dev, pkg-config, zlib1g-dev, liblcms1-dev +Build-Depends: debhelper (>= 4.0.0), intltool, libart-2.0-dev (>= 2.3.10), libgc-dev (>= 1:6.5-1), libglib2.0-dev, libgnomevfs2-dev, libgtk2.0-dev (>= 2.0.6-1), libglibmm-2.4-dev (>> 2.6.1-1), libgtkmm-2.4-dev (>> 2.4.11-2), libgtkspell-dev (>= 2.0.10-3), libpango1.0-dev, libpng12-dev, libpopt-dev, libsigc++-2.0-dev (>= 2.0.10-3), libxml-parser-perl, libxml2-dev (>= 2.6.0), libxslt1-dev, pkg-config, zlib1g-dev, liblcms1-dev Standards-Version: 3.6.1 Package: inkscape diff --git a/tools-version.sh b/tools-version.sh index b3a960936..0dfea2011 100755 --- a/tools-version.sh +++ b/tools-version.sh @@ -5,7 +5,7 @@ # distro web page: http://distro.pipfield.ca/ # Please add a tool you want to check -TOOLS="m4 autoconf autoheader automake automake-1.7 automake-1.8 automake-1.9 aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 intltoolize gettextize libtoolize " +TOOLS="m4 autoconf autoheader automake automake-1.7 automake-1.8 automake-1.9 aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 intltoolize gettextize " ENVPATTERN='PATH\|FLAGS\|LANG' srcdir=`dirname $0` |