SF.net SVN: geany-plugins:[1314] trunk/geany-plugins/build/geany.m4

[hyperair at users.sourceforge.net]

Revision: 1314
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1314&view=rev
Author:   hyperair
Date:     2010-04-28 05:31:58 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Use --with-geany-libdir instead of --with-geany-prefix

This should fix issues caused by the pkg-config override on 64-bit
systems that do not use /usr/lib/ as the libdir for pkg-config, by using
an overridable `pkg-config --libdir` geany. Should fix Bug #2992905

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

Modified: trunk/geany-plugins/build/geany.m4
===================================================================
--- trunk/geany-plugins/build/geany.m4	2010-04-26 23:04:32 UTC (rev 1313)
+++ trunk/geany-plugins/build/geany.m4	2010-04-28 05:31:58 UTC (rev 1314)
@@ -2,15 +2,15 @@
 [
     AC_REQUIRE([PKG_PROG_PKG_CONFIG])
     AC_ARG_WITH([geany-prefix],
-        AC_HELP_STRING([--with-geany-prefix=PATH],
-            [Set Geany's installation prefix [[default=auto]]]),
-        [geany_prefix=${withval}],
-        [geany_prefix=$(${PKG_CONFIG} --variable=prefix geany)])
+        AC_HELP_STRING([--with-geany-libdir=PATH],
+            [Set Geany's installation libdir [[default=auto]]]),
+        [geany_libdir=${withval}],
+        [geany_libdir=$(${PKG_CONFIG} --variable=libdir geany)])
 
-    export PKG_CONFIG_PATH="$geany_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH="$geany_libdir/pkgconfig:$PKG_CONFIG_PATH"
 
     PKG_CHECK_MODULES([GEANY], [geany >= $1])
-    geanypluginsdir=$(${PKG_CONFIG} --variable=libdir geany)/geany
+    geanypluginsdir=$geany_libdir/geany
     geanyversion=$(${PKG_CONFIG} --modversion geany)
     AC_SUBST([geanypluginsdir])
 


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