diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 21:41:05 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-16 21:41:05 +0000 |
commit | 9be9636c6bc52f09e366078ea24d92a4665c8830 (patch) | |
tree | 44919895331078d4ae69e0cd6fb7278266e727c0 /lib/libXau | |
parent | a595e9a5cde63eeaba15a370e33fe28d08ee3734 (diff) |
regen
Diffstat (limited to 'lib/libXau')
-rw-r--r-- | lib/libXau/Makefile.in | 201 | ||||
-rw-r--r-- | lib/libXau/aclocal.m4 | 22 | ||||
-rw-r--r-- | lib/libXau/configure | 221 |
3 files changed, 378 insertions, 66 deletions
diff --git a/lib/libXau/Makefile.in b/lib/libXau/Makefile.in index 4ec5ed088..c0aec4c01 100644 --- a/lib/libXau/Makefile.in +++ b/lib/libXau/Makefile.in @@ -39,6 +39,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @KERBEROS_TRUE@am__append_1 = k5encode.c +check_PROGRAMS = Autest$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/xau.pc.in $(top_srcdir)/configure \ @@ -61,7 +62,8 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libmandir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xauincludedir)" + "$(DESTDIR)$(lintlibdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(xauincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -73,6 +75,9 @@ am_libXau_la_OBJECTS = AuDispose.lo AuFileName.lo AuGetAddr.lo \ AuGetBest.lo AuLock.lo AuRead.lo AuUnlock.lo AuWrite.lo \ $(am__objects_1) libXau_la_OBJECTS = $(am_libXau_la_OBJECTS) +am_Autest_OBJECTS = Autest.$(OBJEXT) +Autest_OBJECTS = $(am_Autest_OBJECTS) +Autest_DEPENDENCIES = libXau.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -84,11 +89,12 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libXau_la_SOURCES) -DIST_SOURCES = $(am__libXau_la_SOURCES_DIST) +SOURCES = $(libXau_la_SOURCES) $(Autest_SOURCES) +DIST_SOURCES = $(am__libXau_la_SOURCES_DIST) $(Autest_SOURCES) libmanDATA_INSTALL = $(INSTALL_DATA) +lintlibDATA_INSTALL = $(INSTALL_DATA) pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(libman_DATA) $(pkgconfig_DATA) +DATA = $(libman_DATA) $(lintlib_DATA) $(pkgconfig_DATA) xauincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(xauinclude_HEADERS) ETAGS = etags @@ -155,12 +161,19 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINT = @LINT@ +LINTLIB = @LINTLIB@ +LINT_FALSE = @LINT_FALSE@ +LINT_FLAGS = @LINT_FLAGS@ +LINT_TRUE = @LINT_TRUE@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@ +MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ OBJDUMP = @OBJDUMP@ @@ -238,15 +251,23 @@ xauincludedir = $(includedir)/X11 xauinclude_HEADERS = include/X11/Xauth.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xau.pc +TESTS = Autest +Autest_SOURCES = Autest.c +Autest_LDADD = libXau.la +@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) + +@MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir) +@MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB) LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libmandir = $(LIB_MAN_DIR) libman_PRE = Xau.man BUILT_SOURCES = shadows.DONE -CLEANFILES = $(libman_DATA) +CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(Xau_shadows:=.@LIB_MAN_SUFFIX@) -EXTRA_DIST = xau.pc.in Autest.c $(libman_PRE) +EXTRA_DIST = xau.pc.in $(libman_PRE) ChangeLog Xau_shadows = \ XauFileName \ XauReadAuth \ @@ -346,6 +367,16 @@ clean-libLTLIBRARIES: libXau.la: $(libXau_la_OBJECTS) $(libXau_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libXau_la_LDFLAGS) $(libXau_la_OBJECTS) $(libXau_la_LIBADD) $(LIBS) +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +Autest$(EXEEXT): $(Autest_OBJECTS) $(Autest_DEPENDENCIES) + @rm -f Autest$(EXEEXT) + $(LINK) $(Autest_LDFLAGS) $(Autest_OBJECTS) $(Autest_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -360,6 +391,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuRead.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuUnlock.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuWrite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Autest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/k5encode.Plo@am__quote@ .c.o: @@ -409,6 +441,23 @@ uninstall-libmanDATA: echo " rm -f '$(DESTDIR)$(libmandir)/$$f'"; \ rm -f "$(DESTDIR)$(libmandir)/$$f"; \ done +install-lintlibDATA: $(lintlib_DATA) + @$(NORMAL_INSTALL) + test -z "$(lintlibdir)" || $(mkdir_p) "$(DESTDIR)$(lintlibdir)" + @list='$(lintlib_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(lintlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lintlibdir)/$$f'"; \ + $(lintlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lintlibdir)/$$f"; \ + done + +uninstall-lintlibDATA: + @$(NORMAL_UNINSTALL) + @list='$(lintlib_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(lintlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(lintlibdir)/$$f"; \ + done install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" @@ -492,6 +541,79 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) @@ -522,6 +644,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 \ @@ -620,11 +745,13 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libmandir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xauincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libmandir)" "$(DESTDIR)$(lintlibdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xauincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -656,8 +783,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -676,8 +803,8 @@ info: info-am info-am: -install-data-am: install-libmanDATA install-pkgconfigDATA \ - install-xauincludeHEADERS +install-data-am: install-libmanDATA install-lintlibDATA \ + install-pkgconfigDATA install-xauincludeHEADERS install-exec-am: install-libLTLIBRARIES @@ -708,36 +835,52 @@ ps: ps-am ps-am: uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-libmanDATA uninstall-pkgconfigDATA \ - uninstall-xauincludeHEADERS - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-libmanDATA install-man \ - install-pkgconfigDATA install-strip install-xauincludeHEADERS \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-libmanDATA \ + uninstall-libmanDATA uninstall-lintlibDATA \ uninstall-pkgconfigDATA uninstall-xauincludeHEADERS +.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ + clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-libmanDATA install-lintlibDATA \ + install-man install-pkgconfigDATA install-strip \ + install-xauincludeHEADERS installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-libmanDATA uninstall-lintlibDATA \ + uninstall-pkgconfigDATA uninstall-xauincludeHEADERS + + +@LINT_TRUE@lint: +@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXau_la_SOURCES) + +@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libXau_la_SOURCES) +@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES) shadows.DONE: -rm -f $(Xau_shadows:=.@LIB_MAN_SUFFIX@) (for i in $(Xau_shadows:=.@LIB_MAN_SUFFIX@) ; do \ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $$i; \ done) + touch shadows.DONE Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ < $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX) + +.PHONY: 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/libXau/aclocal.m4 b/lib/libXau/aclocal.m4 index 84a134a55..ce70f3c6a 100644 --- a/lib/libXau/aclocal.m4 +++ b/lib/libXau/aclocal.m4 @@ -7445,7 +7445,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.2 + [XORG_MACROS_version=1.1.3 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7849,7 +7849,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, @@ -7862,5 +7863,22 @@ 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]) ]) diff --git a/lib/libXau/configure b/lib/libXau/configure index 686fef6c6..73683bebc 100644 --- a/lib/libXau/configure +++ b/lib/libXau/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libXau 1.0.1. +# Generated by GNU Autoconf 2.59 for libXau 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='libXau' PACKAGE_TARNAME='libXau' -PACKAGE_VERSION='1.0.1' -PACKAGE_STRING='libXau 1.0.1' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='libXau 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -464,7 +464,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XAU_CFLAGS XAU_LIBS KERBEROS_TRUE KERBEROS_FALSE APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XAU_CFLAGS XAU_LIBS KERBEROS_TRUE KERBEROS_FALSE LINT LINT_FLAGS LINT_TRUE LINT_FALSE LINTLIB MAKE_LINT_LIB_TRUE MAKE_LINT_LIB_FALSE APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -965,7 +965,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 libXau 1.0.1 to adapt to many kinds of systems. +\`configure' configures libXau 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1031,7 +1031,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXau 1.0.1:";; + short | recursive ) echo "Configuration of libXau 1.0.3:";; esac cat <<\_ACEOF @@ -1050,6 +1050,7 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-xthreads Disable libXau support for Multithreading + --enable-lint-library Create lint library (default: disabled) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1059,6 +1060,8 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] + --with-lint Use a lint-style source code checker (default: + disabled) --with-release-version=STRING Use release version string in package name @@ -1178,7 +1181,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libXau configure 1.0.1 +libXau configure 1.0.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1192,7 +1195,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 libXau $as_me 1.0.1, which was +It was created by libXau $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1835,7 +1838,7 @@ fi # Define the identity of the package. PACKAGE='libXau' - VERSION='1.0.1' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -1993,6 +1996,31 @@ fi ac_config_headers="$ac_config_headers config.h" +# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro + + + XORG_MACROS_needed_version=1.1 + XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` + XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'` + echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5 +echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6 + XORG_MACROS_version=1.1.3 + XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` + XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'` + if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then + { { echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5 +echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;} + { (exit 1); exit 1; }; } + fi + if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then + { { echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5 +echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5 +echo "${ECHO_T}yes, $XORG_MACROS_version" >&6 + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3798,7 +3826,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3801 "configure"' > conftest.$ac_ext + echo '#line 3829 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5639,7 +5667,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5642:" \ +echo "$as_me:5670:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6702,11 +6730,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6705: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6733: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6709: \$? = $ac_status" >&5 + echo "$as_me:6737: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6970,11 +6998,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6973: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7001: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6977: \$? = $ac_status" >&5 + echo "$as_me:7005: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7074,11 +7102,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7077: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7105: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7081: \$? = $ac_status" >&5 + echo "$as_me:7109: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9419,7 +9447,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9422 "configure" +#line 9450 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9519,7 +9547,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9522 "configure" +#line 9550 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11859,11 +11887,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11862: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11890: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11866: \$? = $ac_status" >&5 + echo "$as_me:11894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11963,11 +11991,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11966: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11994: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11970: \$? = $ac_status" >&5 + echo "$as_me:11998: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13533,11 +13561,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13536: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13540: \$? = $ac_status" >&5 + echo "$as_me:13568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13637,11 +13665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13640: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13668: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13644: \$? = $ac_status" >&5 + echo "$as_me:13672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15840,11 +15868,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15843: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15871: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15847: \$? = $ac_status" >&5 + echo "$as_me:15875: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16108,11 +16136,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16111: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16139: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16115: \$? = $ac_status" >&5 + echo "$as_me:16143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16212,11 +16240,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16215: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16243: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16219: \$? = $ac_status" >&5 + echo "$as_me:16247: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19206,6 +19234,85 @@ fi XAU_CFLAGS="$XAU_CFLAGS $XTHREAD_CFLAGS" fi + + +# Allow checking code with lint, sparse, etc. + +# Check whether --with-lint or --without-lint was given. +if test "${with_lint+set}" = set; then + withval="$with_lint" + use_lint=$withval +else + use_lint=no +fi; +if test "x$use_lint" = "xyes" ; then + LINT="lint" +else + LINT="$use_lint" +fi +if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then + case $LINT in + lint|*/lint) + case $host_os in + solaris*) + LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; + esac + ;; + esac +fi + + + + + +if test x$LINT != xno; then + LINT_TRUE= + LINT_FALSE='#' +else + LINT_TRUE='#' + LINT_FALSE= +fi + + + + + +# Build lint "library" for more indepth checks of programs calling this library +# Check whether --enable-lint-library or --disable-lint-library was given. +if test "${enable_lint_library+set}" = set; then + enableval="$enable_lint_library" + make_lint_lib=$enableval +else + make_lint_lib=no +fi; +if test "x$make_lint_lib" != "xno" ; then + if test "x$LINT" = "xno" ; then + { { echo "$as_me:$LINENO: error: Cannot make lint library without --with-lint" >&5 +echo "$as_me: error: Cannot make lint library without --with-lint" >&2;} + { (exit 1); exit 1; }; } + fi + if test "x$make_lint_lib" = "xyes" ; then + LINTLIB=llib-lXau.ln + else + LINTLIB=$make_lint_lib + fi +fi + + + +if test x$make_lint_lib != xno; then + MAKE_LINT_LIB_TRUE= + MAKE_LINT_LIB_FALSE='#' +else + MAKE_LINT_LIB_TRUE='#' + MAKE_LINT_LIB_FALSE= +fi + + + +LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}" + if test "x$GCC" = "xyes"; then GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ @@ -19300,6 +19407,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 xau.pc" cat >confcache <<\_ACEOF @@ -19428,6 +19558,20 @@ echo "$as_me: error: conditional \"KERBEROS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"LINT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${MAKE_LINT_LIB_TRUE}" && test -z "${MAKE_LINT_LIB_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAKE_LINT_LIB\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAKE_LINT_LIB\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -19699,7 +19843,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libXau $as_me 1.0.1, which was +This file was extended by libXau $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19762,7 +19906,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libXau config.status 1.0.1 +libXau config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -20041,6 +20185,13 @@ s,@XAU_CFLAGS@,$XAU_CFLAGS,;t t s,@XAU_LIBS@,$XAU_LIBS,;t t s,@KERBEROS_TRUE@,$KERBEROS_TRUE,;t t s,@KERBEROS_FALSE@,$KERBEROS_FALSE,;t t +s,@LINT@,$LINT,;t t +s,@LINT_FLAGS@,$LINT_FLAGS,;t t +s,@LINT_TRUE@,$LINT_TRUE,;t t +s,@LINT_FALSE@,$LINT_FALSE,;t t +s,@LINTLIB@,$LINTLIB,;t t +s,@MAKE_LINT_LIB_TRUE@,$MAKE_LINT_LIB_TRUE,;t t +s,@MAKE_LINT_LIB_FALSE@,$MAKE_LINT_LIB_FALSE,;t t s,@APP_MAN_SUFFIX@,$APP_MAN_SUFFIX,;t t s,@LIB_MAN_SUFFIX@,$LIB_MAN_SUFFIX,;t t s,@FILE_MAN_SUFFIX@,$FILE_MAN_SUFFIX,;t t |