diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 21:34:04 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 21:34:04 +0000 |
commit | a2442a8ce0c02d213c26ff6c61633908f0eadaa7 (patch) | |
tree | 56e7f475c9c9df680d5b38ddf87da3997db96501 | |
parent | deead6820da8997e7398e7381e2a40d1c6a5bea5 (diff) |
regen
-rw-r--r-- | lib/libICE/Makefile.in | 12 | ||||
-rw-r--r-- | lib/libICE/aclocal.m4 | 20 | ||||
-rw-r--r-- | lib/libICE/config.h.in | 9 | ||||
-rw-r--r-- | lib/libICE/configure | 43 |
4 files changed, 69 insertions, 15 deletions
diff --git a/lib/libICE/Makefile.in b/lib/libICE/Makefile.in index 4284d441e..3a1fe3aa6 100644 --- a/lib/libICE/Makefile.in +++ b/lib/libICE/Makefile.in @@ -453,6 +453,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -638,7 +641,7 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -653,9 +656,10 @@ uninstall-info: uninstall-info-recursive uninstall-pkgconfigDATA -ChangeLog: FORCE - git-log > ChangeLog -FORCE: ChangeLog +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libICE/aclocal.m4 b/lib/libICE/aclocal.m4 index 8a51bd3aa..a9e7b3a3c 100644 --- a/lib/libICE/aclocal.m4 +++ b/lib/libICE/aclocal.m4 @@ -7427,7 +7427,8 @@ dnl # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -7440,6 +7441,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ diff --git a/lib/libICE/config.h.in b/lib/libICE/config.h.in index bc74b8897..19a3e058c 100644 --- a/lib/libICE/config.h.in +++ b/lib/libICE/config.h.in @@ -60,6 +60,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE diff --git a/lib/libICE/configure b/lib/libICE/configure index 4d9b7ea62..b7320fb74 100644 --- a/lib/libICE/configure +++ b/lib/libICE/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libICE 1.0.2. +# Generated by GNU Autoconf 2.59 for libICE 1.0.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libICE' PACKAGE_TARNAME='libICE' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='libICE 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='libICE 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -974,7 +974,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libICE 1.0.2 to adapt to many kinds of systems. +\`configure' configures libICE 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1040,7 +1040,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libICE 1.0.2:";; + short | recursive ) echo "Configuration of libICE 1.0.3:";; esac cat <<\_ACEOF @@ -1194,7 +1194,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libICE configure 1.0.2 +libICE configure 1.0.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1208,7 +1208,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libICE $as_me 1.0.2, which was +It was created by libICE $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1853,7 +1853,7 @@ fi # Define the identity of the package. PACKAGE='libICE' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -20516,6 +20516,29 @@ fi; echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile src/Makefile ice.pc" cat >confcache <<\_ACEOF @@ -20915,7 +20938,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libICE $as_me 1.0.2, which was +This file was extended by libICE $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20978,7 +21001,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libICE config.status 1.0.2 +libICE config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |