Mercurial > pidgin

changeset 15901:402236ee7981

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename gaim.m4 to purple.m4. This is for other applications that want to compile against libpurple, right? Do you think we need a gaim.m4 for backward compatibility?
author Mark Doliner <mark@kingant.net>
date Sun, 25 Mar 2007 01:01:22 +0000
parents 3a45be1c3281
children 15cccdd32321 2cf21661f828
files m4macros/Makefile.am m4macros/gaim.m4 m4macros/purple.m4 pidgin.spec.in
diffstat 4 files changed, 104 insertions(+), 104 deletions(-) [+]
line wrap: on
line diff
--- a/m4macros/Makefile.am	Sun Mar 25 00:50:43 2007 +0000
+++ b/m4macros/Makefile.am	Sun Mar 25 01:01:22 2007 +0000
@@ -1,4 +1,4 @@
-installed_m4=gaim.m4
+installed_m4=purple.m4
 
 EXTRA_DIST=$(installed_m4)
 
--- a/m4macros/gaim.m4	Sun Mar 25 00:50:43 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-dnl ###########################################################################
-dnl # Configure paths for Gaim
-dnl # Gary Kramlich 2005
-dnl #
-dnl # Based off of glib-2.0.m4 by Owen Taylor
-dnl ###########################################################################
-
-dnl ###########################################################################
-dnl # AM_PATH_GAIM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl #
-dnl # Test for gaim and define GAIM_CFLAGS, GAIM_LIBS, GAIM_DATADIR, and
-dnl # GAIM_LIBDIR
-dnl ###########################################################################
-AC_DEFUN([AM_PATH_GAIM],
-[dnl
-	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-	no_gaim=""
-
-	if test x"$PKG_CONFIG" != x"no" ; then
-		if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-			:
-		else
-			echo "*** pkg-config is too old;  version 0.7 or newer is required."
-			no_gaim="yes"
-			PKG_CONFIG="no"
-		fi
-	else
-		no_gaim="yes"
-	fi
-
-	min_version=ifelse([$1], ,2.0.0,$1)
-	found_version=""
-	
-	AC_MSG_CHECKING(for gaim - version >= $min_version)
-
-	if test x"$no_gaim" = x"" ; then
-		GAIM_DATADIR=`$PKG_CONFIG --variable=datadir gaim`
-		GAIM_LIBDIR=`$PKG_CONFIG --variable=libdir gaim`
-
-		GAIM_CFLAGS=`$PKG_CONFIG --cflags gaim`
-		GAIM_LIBS=`$PKG_CONFIG --libs gaim`
-
-		gaim_version=`$PKG_CONFIG --modversion gaim`
-		gaim_major_version=`echo $gaim_version | cut -d. -f 1`
-		gaim_minor_version=`echo $gaim_version | cut -d. -f 2`
-		
-		dnl # stash the micro version in a temp variable.  Then stash
-		dnl # the numeric for it in gaim_micro_version and anything
-		dnl # else in gaim_extra_version.
-		gaim_micro_version_temp=`echo $gaim_version | cut -d. -f 3`
-		gaim_micro_version=`echo $gaim_micro_version_temp | sed 's/[[^0-9]]//g'`
-		gaim_extra_version=`echo $gaim_micro_version_temp | sed 's/[[0-9]]//g'`
-
-		dnl # get the major, minor, and macro that the user gave us
-		min_major_version=`echo $min_version | cut -d. -f 1`
-		min_minor_version=`echo $min_version | cut -d. -f 2`
-		min_micro_version=`echo $min_version | cut -d. -f 3`
-
-		dnl # check the users version against the version from pkg-config
-		if test $gaim_major_version -eq $min_major_version -a \
-			$gaim_minor_version -ge $min_minor_version -a \
-			$gaim_micro_version -ge $min_micro_version
-		then
-			:
-		else
-			no_gaim="yes"
-			found_version="$gaim_major_version.$gaim_minor_version.$gaim_micro_version$gaim_extra_version"
-		fi
-
-		dnl # Do we want a compile test here?
-	fi
-
-	if test x"$no_gaim" = x"" ; then
-		AC_MSG_RESULT(yes (version $gaim_major_version.$gaim_minor_version.$gaim_micro_version$gaim_extra_version))
-		ifelse([$2], , :, [$2])
-	else
-		AC_MSG_RESULT(no)
-		if test x"$PKG_CONFIG" = x"no" ; then
-			echo "*** A new enough version of pkg-config was not found."
-			echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-		fi
-
-		if test x"found_version" != x"" ; then
-			echo "*** A new enough version of gaim was not found."
-			echo "*** You have version $found_version"
-			echo "*** See http://gaim.sf.net/"
-		fi
-		
-		GAIM_CFLAGS=""
-		GAIM_LIBS=""
-		GAIM_DATADIR=""
-		GAIM_LIBDIR=""
-
-		ifelse([$3], , :, [$3])
-	fi
-
-	AC_SUBST(GAIM_CFLAGS)
-	AC_SUBST(GAIM_LIBS)
-	AC_SUBST(GAIM_DATADIR)
-	AC_SUBST(GAIM_LIBDIR)
-])
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/m4macros/purple.m4	Sun Mar 25 01:01:22 2007 +0000
@@ -0,0 +1,102 @@
+dnl ###########################################################################
+dnl # Configure paths for libpurple
+dnl # Gary Kramlich 2005
+dnl #
+dnl # Based off of glib-2.0.m4 by Owen Taylor
+dnl ###########################################################################
+
+dnl ###########################################################################
+dnl # AM_PATH_PURPLE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl #
+dnl # Test for purple and define PURPLE_CFLAGS, PURPLE_LIBS, PURPLE_DATADIR, and
+dnl # PURPLE_LIBDIR
+dnl ###########################################################################
+AC_DEFUN([AM_PATH_PURPLE],
+[dnl
+	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+	no_purple=""
+
+	if test x"$PKG_CONFIG" != x"no" ; then
+		if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+			:
+		else
+			echo "*** pkg-config is too old;  version 0.7 or newer is required."
+			no_purple="yes"
+			PKG_CONFIG="no"
+		fi
+	else
+		no_purple="yes"
+	fi
+
+	min_version=ifelse([$1], ,2.0.0,$1)
+	found_version=""
+
+	AC_MSG_CHECKING(for purple - version >= $min_version)
+
+	if test x"$no_purple" = x"" ; then
+		PURPLE_DATADIR=`$PKG_CONFIG --variable=datadir purple`
+		PURPLE_LIBDIR=`$PKG_CONFIG --variable=libdir purple`
+
+		PURPLE_CFLAGS=`$PKG_CONFIG --cflags purple`
+		PURPLE_LIBS=`$PKG_CONFIG --libs purple`
+
+		purple_version=`$PKG_CONFIG --modversion purple`
+		purple_major_version=`echo $purple_version | cut -d. -f 1`
+		purple_minor_version=`echo $purple_version | cut -d. -f 2`
+
+		dnl # stash the micro version in a temp variable.  Then stash
+		dnl # the numeric for it in purple_micro_version and anything
+		dnl # else in purple_extra_version.
+		purple_micro_version_temp=`echo $purple_version | cut -d. -f 3`
+		purple_micro_version=`echo $purple_micro_version_temp | sed 's/[[^0-9]]//g'`
+		purple_extra_version=`echo $purple_micro_version_temp | sed 's/[[0-9]]//g'`
+
+		dnl # get the major, minor, and macro that the user gave us
+		min_major_version=`echo $min_version | cut -d. -f 1`
+		min_minor_version=`echo $min_version | cut -d. -f 2`
+		min_micro_version=`echo $min_version | cut -d. -f 3`
+
+		dnl # check the users version against the version from pkg-config
+		if test $purple_major_version -eq $min_major_version -a \
+			$purple_minor_version -ge $min_minor_version -a \
+			$purple_micro_version -ge $min_micro_version
+		then
+			:
+		else
+			no_purple="yes"
+			found_version="$purple_major_version.$purple_minor_version.$purple_micro_version$purple_extra_version"
+		fi
+
+		dnl # Do we want a compile test here?
+	fi
+
+	if test x"$no_purple" = x"" ; then
+		AC_MSG_RESULT(yes (version $purple_major_version.$purple_minor_version.$purple_micro_version$purple_extra_version))
+		ifelse([$2], , :, [$2])
+	else
+		AC_MSG_RESULT(no)
+		if test x"$PKG_CONFIG" = x"no" ; then
+			echo "*** A new enough version of pkg-config was not found."
+			echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+		fi
+
+		if test x"found_version" != x"" ; then
+			echo "*** A new enough version of purple was not found."
+			echo "*** You have version $found_version"
+			echo "*** See http://pidgin.im/"
+		fi
+
+		PURPLE_CFLAGS=""
+		PURPLE_LIBS=""
+		PURPLE_DATADIR=""
+		PURPLE_LIBDIR=""
+
+		ifelse([$3], , :, [$3])
+	fi
+
+	AC_SUBST(PURPLE_CFLAGS)
+	AC_SUBST(PURPLE_LIBS)
+	AC_SUBST(PURPLE_DATADIR)
+	AC_SUBST(PURPLE_LIBDIR)
+])
--- a/pidgin.spec.in	Sun Mar 25 00:50:43 2007 +0000
+++ b/pidgin.spec.in	Sun Mar 25 01:01:22 2007 +0000
@@ -354,7 +354,7 @@
 %{_libdir}/pkgconfig/purple.pc
 %{_libdir}/pkgconfig/pidgin.pc
 %{_libdir}/pkgconfig/gnt.pc
-%{_datadir}/aclocal/gaim.m4
+%{_datadir}/aclocal/pidgin.m4
 %if 0%{?_with_dbus:1}
 %{_libdir}/libpurple-client.so
 %endif