org.guifications.gf2: 8762a83802201f3f1a6fe8bf474b697217cfaf99

rekkanoryo at guifications.org rekkanoryo at guifications.org
Sun Dec 16 01:05:05 CST 2007


-----------------------------------------------------------------
Revision: 8762a83802201f3f1a6fe8bf474b697217cfaf99
Ancestor: 9ddc1c00c0fa5d09fda2ab138c6cf09dded7c0a2
Author: rekkanoryo at guifications.org
Date: 2007-12-16T06:20:58
Branch: org.guifications.gf2

Modified files:
        configure.ac

ChangeLog: 

Don't munge prefix if one is specified.

-----------------------------------------------------------------
This revision's diffstat output:
 configure.ac |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
-------------- next part --------------
============================================================
--- configure.ac	17bc551d347aabdf4af3d63f2b905240ec2c111b
+++ configure.ac	12749803bdb67ff75081bb156ba3d8f796564788
@@ -84,12 +84,18 @@ PKG_CHECK_MODULES(PIDGIN, pidgin purple)
 
 PKG_CHECK_MODULES(PIDGIN, pidgin purple)
 
+if test x"$prefix" = x"NONE" ; then
+	PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
+	PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
+else
+	PIDGIN_LIBDIR="$libdir"
+	PIDGIN_DATADIR="$datadir"
+fi
+
 AC_SUBST(PIDGIN_CFLAGS)
 AC_SUBST(PIDGIN_LIBS)
 AC_SUBST(PURPLE_CFLAGS)
 AC_SUBST(PURPLE_LIBS)
-PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
-PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
 AC_SUBST(PIDGIN_LIBDIR)
 AC_SUBST(PIDGIN_DATADIR)
 


More information about the Plugins-commits mailing list