/pidgin/main: 1db9ef49bc22: Fix including config.h file into per...

[Tomasz Wasilczyk]

Changeset: 1db9ef49bc22f1e341dd418dd57416c36740dc33
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-02 20:17 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1db9ef49bc22

Description:

Fix including config.h file into perl files

diffstat:

 .hgignore                                    |  1 +
 libpurple/plugins/perl/common/Makefile.PL.in |  4 ++--
 libpurple/plugins/perl/common/Purple.pm      |  2 --
 pidgin/plugins/perl/common/Makefile.PL.in    |  4 ++--
 pidgin/plugins/perl/common/Pidgin.pm         |  2 --
 5 files changed, 5 insertions(+), 8 deletions(-)

diffs (74 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 .*.swp
 clang_output_*
+pidgin-*
 
 syntax: regexp
 (.*/)?TAGS$
diff --git a/libpurple/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
--- a/libpurple/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
@@ -4,14 +4,14 @@ use ExtUtils::MakeMaker;
 # of the Makefile that is written.
 WriteMakefile(
     'NAME'              => 'Purple',
-    'VERSION_FROM'      => '@srcdir@/Purple.pm', # finds $VERSION
+    'VERSION'           => '@VERSION@',
     'PREREQ_PM'         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM    => '@srcdir@/Purple.pm', # finds $ABSTRACT
        AUTHOR           => 'Purple <https://pidgin.im/>') : ()),
     'DEFINE'            => '@DEBUG_CFLAGS@ -Wno-float-equal',
     'dynamic_lib'       => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
-    'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@',
+    'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@ -DHAVE_CONFIG_H',
     'OBJECT'            => '$(O_FILES)', # link all the C files too
 #    'OPTIMIZE'          => '-g', # For debugging
     'INSTALLDIRS'          => 'vendor',
diff --git a/libpurple/plugins/perl/common/Purple.pm b/libpurple/plugins/perl/common/Purple.pm
--- a/libpurple/plugins/perl/common/Purple.pm
+++ b/libpurple/plugins/perl/common/Purple.pm
@@ -27,8 +27,6 @@ our @EXPORT = qw(
 	
 );
 
-our $VERSION = '0.01';
-
 sub AUTOLOAD {
 	# This AUTOLOAD is used to 'autoload' constants from the constant()
 	# XS function.
diff --git a/pidgin/plugins/perl/common/Makefile.PL.in b/pidgin/plugins/perl/common/Makefile.PL.in
--- a/pidgin/plugins/perl/common/Makefile.PL.in
+++ b/pidgin/plugins/perl/common/Makefile.PL.in
@@ -4,13 +4,13 @@ use ExtUtils::MakeMaker;
 # of the Makefile that is written.
 WriteMakefile(
     'NAME'             => 'Pidgin',
-    'VERSION_FROM'     => '@srcdir@/Pidgin.pm', # finds $VERSION
+    'VERSION'          => '@VERSION@',
     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
       ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT
        'AUTHOR'        => 'Pidgin <https://pidgin.im/>') :  ()),
     'DEFINE'        => '@DEBUG_CFLAGS@ -Wno-float-equal',
     'dynamic_lib'       => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
-    'INC'           => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@ @WEBKIT_CFLAGS@',
+    'INC'           => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@ @WEBKIT_CFLAGS@ -DHAVE_CONFIG_H',
     'OBJECT'        => '$(O_FILES)', # link all the C files too
     'TYPEMAPS'      => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
 #    'OPTIMIZE'      => '-g', # For debugging.
diff --git a/pidgin/plugins/perl/common/Pidgin.pm b/pidgin/plugins/perl/common/Pidgin.pm
--- a/pidgin/plugins/perl/common/Pidgin.pm
+++ b/pidgin/plugins/perl/common/Pidgin.pm
@@ -5,8 +5,6 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '0.01';
-
 use Purple;
 
 require XSLoader;