summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cvsignore3
-rw-r--r--ChangeLog14
-rw-r--r--Makefile.am17
-rwxr-xr-xautogen.sh94
-rw-r--r--configure.in9
-rwxr-xr-xpango-zip.sh.in8
-rw-r--r--pango/Makefile.am8
-rw-r--r--pango/pango.rc.in4
-rw-r--r--pango/pangoft2.rc.in4
-rw-r--r--pango/pangowin32.rc.in4
10 files changed, 64 insertions, 101 deletions
diff --git a/.cvsignore b/.cvsignore
index f3aa4033..5bd6b840 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -36,3 +36,6 @@ aclocal.m4
sgml
stamp-h.in
autom4te.cache
+xmldocs.make
+omf.make
+INSTALL
diff --git a/ChangeLog b/ChangeLog
index df76cfcd..7442058c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-06-21 Behdad Esfahbod <behdad@gnome.org>
+
+ * autogen.sh: Just call gnome-autogen.sh. The old autogen.sh had
+ poor version checking and was borking with libtool 2.x.
+
+ * Makefile.am:
+ * configure.in:
+ * pango-zip.sh.in:
+ * pango/Makefile.am:
+ * pango/pango.rc.in:
+ * pango/pangoft2.rc.in:
+ * pango/pangowin32.rc.in: Rename LT_* variables such that autoconf
+ doesn't err on "possibly undefined macros".
+
2006-06-12 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.13.2 ===
diff --git a/Makefile.am b/Makefile.am
index 31aeed26..3f31d6e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,23 @@ EXTRA_DIST = \
README.win32 \
pango-zip.sh \
sanitize-la.sh
+MAINTAINERCLEANFILES = \
+ $(srcdir)/INSTALL \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/autoscan.log \
+ $(srcdir)/compile \
+ $(srcdir)/config.guess \
+ $(srcdir)/config.h.in \
+ $(srcdir)/config.sub \
+ $(srcdir)/configure.scan \
+ $(srcdir)/depcomp \
+ $(srcdir)/install-sh \
+ $(srcdir)/ltmain.sh \
+ $(srcdir)/missing \
+ $(srcdir)/mkinstalldirs \
+ $(srcdir)/omf.make \
+ $(srcdir)/xmldocs.make \
+ `find "$(srcdir)" -type f -name Makefile.in -print`
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pango.pc
diff --git a/autogen.sh b/autogen.sh
index 6aa48da9..ebc47e40 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,90 +4,20 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=Pango
-TEST_TYPE=-f
-FILE=pango/pango.h
+REQUIRED_AUTOMAKE_VERSION=1.6
-DIE=0
+PKG_NAME="pango"
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9].[0-9.]*\).*/\1/'`
- case $libtool_version in
- 1.4*|1.5*)
- have_libtool=true
- ;;
- esac
-fi
-if $have_libtool ; then : ; else
- echo
- echo "You must have libtool 1.4 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
- DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have gtk-doc installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
- DIE=1
+(test -f $srcdir/configure.in \
+ && test -f $srcdir/README \
+ && test -d $srcdir/pango) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
}
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "libtool the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
- DIE=1
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
}
-
-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake-1.7
- ACLOCAL=aclocal-1.7
-else
- echo
- echo "You must have automake 1.7.x installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- DIE=1
-fi
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
- fi
-fi
-
-rm -rf autom4te.cache
-
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
-
-libtoolize --force || exit $?
-gtkdocize || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
- echo
- echo "Now type 'make' to compile $PROJECT."
-fi
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index f371db5f..9576a614 100644
--- a/configure.in
+++ b/configure.in
@@ -75,11 +75,10 @@ dnl libtool versioning
m4_define([lt_current], [m4_eval(100 * pango_minor_version + pango_micro_version - pango_interface_age)])
m4_define([lt_revision], [pango_interface_age])
m4_define([lt_age], [m4_eval(pango_binary_age - pango_interface_age)])
-LT_VERSION_INFO="lt_current():lt_revision():lt_age()"
-LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
+VERSION_INFO="lt_current():lt_revision():lt_age()"
+PANGO_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
-AC_SUBST(LT_VERSION_INFO)
-AC_SUBST(LT_CURRENT_MINUS_AGE)
+AC_SUBST(PANGO_CURRENT_MINUS_AGE)
dnl ==========================================================================
@@ -595,7 +594,7 @@ dnl ********************************************************
# Note that -module isn't included here since automake needs to see it to know
# that something like pango-arabic-fc.la is a valid libtool archive
#
-LIBRARY_LIBTOOL_OPTIONS="-version-info $LT_VERSION_INFO -no-undefined"
+LIBRARY_LIBTOOL_OPTIONS="-version-info $VERSION_INFO -no-undefined"
MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version -no-undefined"
if test "$pango_os_win32" = yes; then
# We currently use .def files on Windows
diff --git a/pango-zip.sh.in b/pango-zip.sh.in
index f70d775a..fe18ef8c 100755
--- a/pango-zip.sh.in
+++ b/pango-zip.sh.in
@@ -11,10 +11,10 @@ zip $ZIP -@ <<EOF
bin/pango-querymodules.exe
etc/pango/pango.aliases
etc/pango/pango.modules
-bin/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/libpangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/libpangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/libpangocairo-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libpango-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll
+bin/libpangoft2-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll
+bin/libpangowin32-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll
+bin/libpangocairo-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll
EOF
zip $ZIP lib/pango/@PANGO_MODULE_VERSION@/modules/*.dll
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 6985fe40..0a7edc8c 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -379,16 +379,16 @@ uninstall-ms-lib:
endif
pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
- lib -name:libpango-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
+ lib -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
- lib -name:libpangoft2-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
+ lib -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
- lib -name:libpangowin32-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
+ lib -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def
- lib -name:libpangocairo-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
+ lib -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
# ------------------- pango-querymodules -------------------
diff --git a/pango/pango.rc.in b/pango/pango.rc.in
index e1cad37e..efecb729 100644
--- a/pango/pango.rc.in
+++ b/pango/pango.rc.in
@@ -16,9 +16,9 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "Pango"
VALUE "FileVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@.0"
- VALUE "InternalName", "pango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
+ VALUE "InternalName", "pango-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software."
- VALUE "OriginalFilename", "pango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
+ VALUE "OriginalFilename", "pango-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "Pango"
VALUE "ProductVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@"
END
diff --git a/pango/pangoft2.rc.in b/pango/pangoft2.rc.in
index 1192c2e5..d92f416c 100644
--- a/pango/pangoft2.rc.in
+++ b/pango/pangoft2.rc.in
@@ -16,9 +16,9 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoFT2"
VALUE "FileVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@.0"
- VALUE "InternalName", "pangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
+ VALUE "InternalName", "pangoft2-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software. Copyright © 2000 Tor Lillqvist"
- VALUE "OriginalFilename", "pangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
+ VALUE "OriginalFilename", "pangoft2-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "PangoFT2"
VALUE "ProductVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@"
END
diff --git a/pango/pangowin32.rc.in b/pango/pangowin32.rc.in
index 7eeb85d1..2eb9be56 100644
--- a/pango/pangowin32.rc.in
+++ b/pango/pangowin32.rc.in
@@ -16,9 +16,9 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoWin32"
VALUE "FileVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@.0"
- VALUE "InternalName", "pangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
+ VALUE "InternalName", "pangowin32-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software. Copyright © 2000 Tor Lillqvist"
- VALUE "OriginalFilename", "pangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
+ VALUE "OriginalFilename", "pangowin32-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "PangoWin32"
VALUE "ProductVersion", "@PANGO_MAJOR_VERSION@.@PANGO_MINOR_VERSION@.@PANGO_MICRO_VERSION@"
END
View Lorry Controller Status