# HG changeset patch # User nenolod # Date 1153252079 25200 # Node ID fe6d04a4019a6131b626cd8243a999410902b60d # Parent 0aa4bee037470f89479fc1afad1201ffbd37ee44 [svn] - try again diff -r 0aa4bee03747 -r fe6d04a4019a ChangeLog --- a/ChangeLog Tue Jul 18 12:33:34 2006 -0700 +++ b/ChangeLog Tue Jul 18 12:47:59 2006 -0700 @@ -1,3 +1,12 @@ +2006-07-18 19:33:34 +0000 William Pitcock + revision [1754] + - ok, move this fix down a little + + + Changes: Modified: + +5 -5 trunk/configure.ac + + 2006-07-18 18:59:43 +0000 William Pitcock revision [1752] - workaround another autoconf bug diff -r 0aa4bee03747 -r fe6d04a4019a configure.ac --- a/configure.ac Tue Jul 18 12:33:34 2006 -0700 +++ b/configure.ac Tue Jul 18 12:47:59 2006 -0700 @@ -115,10 +115,6 @@ dnl These plugins are always built. -if [ "$prefix" = "NONE" ]; then - prefix="${ac_default_prefix}" -fi - INPUT_PLUGINS="cdaudio tonegen console sexypsf wav" OUTPUT_PLUGINS="disk_writer" EFFECT_PLUGINS="audiocompress ladspa voice_removal" @@ -921,7 +917,11 @@ AC_SUBST(VISUALIZATION_PLUGIN_DIR) AC_SUBST(pluginsubs) -dnl XXX Work around an autoconf bug. +dnl XXX Work around some autoconf bugs. +if [ "$prefix" = "NONE" ]; then + prefix="${ac_default_prefix}" +fi + if [ ! $datadir ]; then datadir=${prefix}/share fi