diff options
| author | Eric Anholt <eric@anholt.net> | 2006-10-27 12:35:38 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-10-27 12:35:38 -0700 |
| commit | 0c1954765c32c1bd298111cc6bed2f090494c0cf (patch) | |
| tree | 41a0696fe7566cfb110772362b43bd309ce1a382 | |
| parent | 3c166cc1efe86ca42180a64e14b6bbbc9744bc82 (diff) | |
Fix .pc file with new autotools by using AC_DEFINE_DIR.
With autoconf 2.60, $datadir now expands to use $datarootdir rather than just
$prefix, so the .pc referenced the undefined $datarootdir. AC_DEFINE_DIR
expands it all out for us.
| -rw-r--r-- | acinclude.m4 | 23 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 24 insertions, 1 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..239ba44 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |