Revision: 842 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=842&view=rev Author: hyperair Date: 2009-07-19 10:55:08 +0000 (Sun, 19 Jul 2009)

Log Message: ----------- Tidy up Geany prefix handling

Modified Paths: -------------- trunk/geany-plugins/build/geany.m4

Modified: trunk/geany-plugins/build/geany.m4 =================================================================== --- trunk/geany-plugins/build/geany.m4 2009-07-18 00:21:52 UTC (rev 841) +++ trunk/geany-plugins/build/geany.m4 2009-07-19 10:55:08 UTC (rev 842) @@ -5,18 +5,15 @@ AC_HELP_STRING([--with-geany-prefix=PATH], [Set Geany's installation prefix [[default=auto]]]), [geany_prefix=${withval}], - [geany_prefix=""]) + [geany_prefix=$(${PKG_CONFIG} --variable=prefix geany)])

- OLD_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - test -z $geany_prefix || \ - export PKG_CONFIG_PATH="$geany_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="$geany_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"

PKG_CHECK_MODULES([GEANY], [geany >= $1]) - geanypluginsdir=$($PKG_CONFIG --variable=libdir geany)/geany - geanyversion=$($PKG_CONFIG --modversion geany) + geanypluginsdir=$(${PKG_CONFIG} --variable=libdir geany)/geany + geanyversion=$(${PKG_CONFIG} --modversion geany) AC_SUBST([geanypluginsdir])

- test -z $geany_prefix || \ - PKG_CONFIG_PATH="$OLD_PKG_CONFIG_PATH" - + PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" + test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH ])

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.