diff options
| author | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-12-09 09:31:02 -0600 |
|---|---|---|
| committer | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-12-09 09:31:02 -0600 |
| commit | 75f83503ba1db628137ffc9d1d9e4f2a7a2fd97a (patch) | |
| tree | 7bd1e26e5f088560ffac13c4d4bb14fb7b58cd84 | |
| parent | 2f201b177816be7112884bda180d65f5fff19155 (diff) | |
| parent | 153264a7f290f98e01ed2dbd7265c977ec8ba7e1 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXt
| -rw-r--r-- | acinclude.m4 | 23 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | util/.gitignore | 3 |
3 files changed, 28 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..3d562d4 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,23 @@ +# Copyright © 2006 Stepan Kasal <kasal@ucw.cz> +# Copyright © 2006 Andreas Schwab <schwab@suse.de> +# Copyright © 2006 Guido U. Draheim <guidod@gmx.de> +# Copyright © 2006 Alexandre Oliva + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice and +# this notice are preserved. + +AC_DEFUN([AC_DEFINE_DIR], [ + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. + eval ac_define_dir="\"[$]$2\"" + eval ac_define_dir="\"$ac_define_dir\"" + AC_SUBST($1, "$ac_define_dir") + AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +]) diff --git a/configure.ac b/configure.ac index ddcde66..e49786b 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PREREQ([2.57]) dnl dnl -AC_INIT(libXt, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) +AC_INIT(libXt, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -75,7 +75,7 @@ AC_ARG_WITH(appdefaultdir, [Set app-default directory (default: ${datadir}/X11/app-defaults)]), [appdefaultdir="$withval"], [appdefaultdir=${datadir}/X11/app-defaults]) -AC_SUBST([appdefaultdir]) +AC_DEFINE_DIR([appdefaultdir], [appdefaultdir], [app default data directory]) # Replacement for Imake ToolkitStringsABIOptions, controls string tables # generated by util/string.list in StringDefs.h & Shell.h diff --git a/util/.gitignore b/util/.gitignore index 4b0c577..11e8923 100644 --- a/util/.gitignore +++ b/util/.gitignore @@ -3,3 +3,6 @@ Makefile Makefile.in makestrs +makestrs.1 +makestrs.1x +*.o |