pidgin: 27d803c1: Fix building on Darwin with --disable-nl...

elb at pidgin.im elb at pidgin.im
Wed Mar 9 09:07:57 EST 2011


----------------------------------------------------------------------
Revision: 27d803c1a7d7bd1907e87fba4a7937a44389dd80
Parent:   556a04f5e3dc6f8e218513dd260fd60bb13c33c7
Author:   emanuele.giaquinta at gmail.com
Date:     03/09/11 09:01:56
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/27d803c1a7d7bd1907e87fba4a7937a44389dd80

Changelog: 

Fix building on Darwin with --disable-nls.  Thanks to Emanuele
Giaquinta.

Changes against parent 556a04f5e3dc6f8e218513dd260fd60bb13c33c7

  patched  COPYRIGHT
  patched  configure.ac

-------------- next part --------------
============================================================
--- configure.ac	bb7306b67eca82d0f0777179a09a49a3641a4d28
+++ configure.ac	c04ac0e5abde752adc7c9d1c525702307bcd6ec5
@@ -263,6 +263,31 @@ int main()
 	AC_MSG_RESULT(no)
 ])
 
+# before gettexting, in case iconv matters
+case "$host_os" in
+darwin*)
+	AC_CHECK_LIB(resolv, res_query)
+
+	AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
+		AC_CHECK_HEADER(IOKit/IOKitLib.h, [
+			AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
+			LIBS="$LIBS -framework IOKit -framework CoreFoundation"
+		], [])
+	], [])
+
+	AC_MSG_CHECKING([for fink])
+	if test -d /sw; then
+		AC_MSG_RESULT([found, adding /sw to search paths])
+		CPPFLAGS="$CPPFLAGS -I/sw/include"
+		LDFLAGS="$LDFLAGS -L/sw/lib"
+	else
+		AC_MSG_RESULT([not found])
+	fi
+	;;
+*)
+	;;
+esac
+
 dnl #######################################################################
 dnl # Disable creation and installation of translation files
 dnl #######################################################################
@@ -273,32 +298,6 @@ if test x$enable_i18n = xyes; then
 	GETTEXT_PACKAGE=pidgin
 	AC_SUBST(GETTEXT_PACKAGE)
 
-
-	# before gettexting, in case iconv matters
-	case "$host_os" in
-	darwin*)
-		AC_CHECK_LIB(resolv, res_query)
-
-		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
-			AC_CHECK_HEADER(IOKit/IOKitLib.h, [
-				AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
-				LIBS="$LIBS -framework IOKit -framework CoreFoundation"
-			], [])
-		], [])
-
-		AC_MSG_CHECKING([for fink])
-		if test -d /sw; then
-			AC_MSG_RESULT([found, adding /sw to search paths])
-			CPPFLAGS="$CPPFLAGS -I/sw/include"
-			LDFLAGS="$LDFLAGS -L/sw/lib"
-		else
-			AC_MSG_RESULT([not found])
-		fi
-		;;
-	*)
-		;;
-	esac
-
 	ALL_LINGUAS="af am ar az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mai mhr mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
 	AM_GLIB_GNU_GETTEXT
 
============================================================
--- COPYRIGHT	a984fe8a4a21b5ab3fb695bf948ff8eccae9e55d
+++ COPYRIGHT	3d5cd3b0a3e16d25bb2f2bf706f572fcd9834984
@@ -187,6 +187,7 @@ Brian Geppert
 Ignacy Gawedzki
 Georgi Georgiev
 Brian Geppert
+Emanuele Giaquinta
 Thomas Gibson-Robinson
 Ike Gingerich
 Gustavo Gir?ldez


More information about the Commits mailing list