/pidgin/main: 53a60c0d3040: cross-win32: tidy remaining macros -...

[Tomasz Wasilczyk]

Changeset: 53a60c0d30406d8fc3e525b9aff07522350bcbb7
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-15 17:51 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/53a60c0d3040

Description:

cross-win32: tidy remaining macros - SSL_CERTIFICATES_DIR, BUILDDIR, CONFDIR

diffstat:

 configure.ac                            |  4 ++++
 doc/reference/finch/Makefile.am         |  2 +-
 doc/reference/libpurple/Makefile.am     |  2 +-
 doc/reference/pidgin/Makefile.am        |  2 +-
 libpurple/Makefile.am                   |  6 ------
 libpurple/prefs.c                       |  2 +-
 libpurple/protocols/zephyr/Makefile.am  |  1 -
 libpurple/protocols/zephyr/ZVariables.c |  4 ++--
 libpurple/tests/Makefile.am             |  3 +--
 libpurple/tests/check_libpurple.c       |  2 +-
 10 files changed, 12 insertions(+), 16 deletions(-)

diffs (127 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2155,6 +2155,10 @@ if ! test -z "$ssl_certificates_dir" ; t
 	SSL_CERTIFICATES_DIR="$ssl_certificates_dir"
 fi
 AC_SUBST(SSL_CERTIFICATES_DIR)
+if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
+	AC_DEFINE_UNQUOTED([SSL_CERTIFICATES_DIR], ["$SSL_CERTIFICATES_DIR"],
+		[Directory where SSL certificates can be found])
+fi
 AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")
 
 dnl These two are inverses of each other <-- stolen from evolution!
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -127,7 +127,7 @@ dist-hook: html-build.stamp
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = \
   DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+  SRCDIR=$(abs_srcdir)
 #TODO: fix and enable
 #TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -169,7 +169,7 @@ dist-hook: html-build.stamp
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = \
   DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+  SRCDIR=$(abs_srcdir)
 #TODO: fix and enable
 #TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -144,7 +144,7 @@ dist-hook: html-build.stamp
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = \
   DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+  SRCDIR=$(abs_srcdir)
 #TODO: fix and enable
 #TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -417,9 +417,3 @@ AM_CPPFLAGS = \
 	$(JSON_CFLAGS) \
 	$(GNUTLS_CFLAGS) \
 	$(NSS_CFLAGS)
-
-# INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
-# We want to use SSL_CERTIFICATES_DIR when it's not empty.
-if ! INSTALL_SSL_CERTIFICATES
-AM_CPPFLAGS += -DSSL_CERTIFICATES_DIR=\"$(SSL_CERTIFICATES_DIR)\"
-endif
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -402,7 +402,7 @@ purple_prefs_load()
 
 		if (sysconfdir == NULL)
 			sysconfdir = "";
-		filename = g_build_filename(PURPLE_SYSCONFDIR, "purple", "prefs.xml", NULL);
+		filename = g_build_filename(sysconfdir, "purple", "prefs.xml", NULL);
 
 		purple_debug_info("prefs", "Reading %s\n", filename);
 
diff --git a/libpurple/protocols/zephyr/Makefile.am b/libpurple/protocols/zephyr/Makefile.am
--- a/libpurple/protocols/zephyr/Makefile.am
+++ b/libpurple/protocols/zephyr/Makefile.am
@@ -103,7 +103,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple/protocols \
-	-DCONFDIR=\"$(sysconfdir)\" \
 	$(GLIB_CFLAGS) \
 	$(KRB4_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libpurple/protocols/zephyr/ZVariables.c b/libpurple/protocols/zephyr/ZVariables.c
--- a/libpurple/protocols/zephyr/ZVariables.c
+++ b/libpurple/protocols/zephyr/ZVariables.c
@@ -35,10 +35,10 @@ char *ZGetVariable(var)
 	if (ret != ZERR_NONE)
 		return ret;
 
-#ifdef WIN32
+#ifdef _WIN32
 	varfile = g_strdup("C:\\zephyr\\zephyr.var");
 #else
-	varfile = g_strdup_printf("%s/zephyr.vars", CONFDIR);
+	varfile = g_build_filename(PURPLE_SYSCONFDIR, "zephyr.vars", NULL);
 #endif
 	ret = get_varval(varfile, var);
 	g_free(varfile);
diff --git a/libpurple/tests/Makefile.am b/libpurple/tests/Makefile.am
--- a/libpurple/tests/Makefile.am
+++ b/libpurple/tests/Makefile.am
@@ -27,8 +27,7 @@ check_libpurple_CFLAGS=\
 		$(DEBUG_CFLAGS) \
 		$(LIBXML_CFLAGS) \
 		-I.. \
-		-I$(top_srcdir)/libpurple \
-		-DBUILDDIR=\"$(top_builddir)\"
+		-I$(top_srcdir)/libpurple
 
 check_libpurple_LDADD=\
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
--- a/libpurple/tests/check_libpurple.c
+++ b/libpurple/tests/check_libpurple.c
@@ -46,7 +46,7 @@ purple_check_init(void) {
 	{
 		gchar *home_dir;
 
-		home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL);
+		home_dir = g_build_path(G_DIR_SEPARATOR_S, $(top_builddir), "libpurple", "tests", "home", NULL);
 		purple_util_set_user_dir(home_dir);
 		g_free(home_dir);
 	}