diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-25 19:20:53 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-25 19:20:53 +0000 |
| commit | c0b5d227c601c52f607aae77645f0d1e67c7ffe7 (patch) | |
| tree | ad8f01d74a0868e78edb1ceb725d396fae542386 /graphics/librsvg2 | |
| parent | Upgrade to 1.50.0. (diff) | |
Put USE_LIBTOOL back.
Notes
Notes:
svn path=/head/; revision=58125
Diffstat (limited to 'graphics/librsvg2')
| -rw-r--r-- | graphics/librsvg2/Makefile | 2 | ||||
| -rw-r--r-- | graphics/librsvg2/files/patch-configure | 13 | ||||
| -rw-r--r-- | graphics/librsvg2/files/patch-ltmain.sh | 28 |
3 files changed, 14 insertions, 29 deletions
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 4a62d4ff3b17..519c0a13507c 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOMELIBS= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure new file mode 100644 index 000000000000..444b8335e4d7 --- /dev/null +++ b/graphics/librsvg2/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/25 19:16:30 1.1 ++++ configure 2002/04/25 19:16:42 +@@ -5397,6 +5397,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/graphics/librsvg2/files/patch-ltmain.sh b/graphics/librsvg2/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/graphics/librsvg2/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |