changeset 9905:3547fd2af609

[gaim-migrate @ 10797] (15:09:36) shx: I've got a doubt... what am I considered in Gaim? a crazy patch writer? (15:10:06) LSchiere: of course (15:10:09) LSchiere: are you not on the list? (15:10:23) LSchiere: mmm. you aren't. that needs to be fixed committer: Tailor Script <[e-mail]>

--- a/configure.ac	Sat Aug 28 16:48:47 2004 +0000
+++ b/configure.ac	Sat Aug 28 19:09:38 2004 +0000
@@ -45,19 +45,6 @@
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h)
 
-dnl Check for SILC includes
-AC_ARG_WITH(silc-includes, [  --with-silc-includes=DIR
-                          Compile the SILC plugin against includes in DIR ], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
-SILC_INCLUDES=""
-if test "$ac_silc_includes" != "no"; then
-	SILC_INCLUDES="-I$ac_silc_includes"
-fi
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $SILC_INCLUDES"
-AC_CHECK_HEADER(silcincludes.h, [silcincludes=yes])
-CPPFLAGS="$CPPFLAGS_save"
-AC_SUBST(SILC_INCLUDES)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_STRUCT_TM
@@ -109,15 +96,40 @@
 	])
 ])
 
-dnl check for SILC client libraries
+dnl Check for SILC client includes and libraries
+AC_ARG_WITH(silc-includes, [  --with-silc-includes=DIR
+                          Compile the SILC plugin against includes in DIR ], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
 AC_ARG_WITH(silc-libs, [  --with-silc-libs=DIR    Compile the SILC plugin against the SILC libs in DIR], [ac_silc_libs="$withval"], [ac_silc_libs="no"])
+SILC_CFLAGS=""
 SILC_LIBS=""
-if test "$ac_silc_libs" != "no"; then
-	SILC_LIBS="-L$ac_silc_libs"
+if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then
+	silc_manual_check="yes"
+else
+	silc_manual_check="no"
 fi
-SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread -ldl"
-AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
+if test "x$silc_manual_check" = "xno"; then
+	PKG_CHECK_MODULES(SILC, silc, [
+		have_silc="yes"
+		silcincludes="yes"
+		silcclient="yes"
+	], have_silc="no")
+else
+	if test "$ac_silc_includes" != "no"; then
+		SILC_CFLAGS="-I$ac_silc_includes"
+	fi
+	CPPFLAGS_save="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
+	AC_CHECK_HEADER(silcincludes.h, [silcincludes=yes])
+	CPPFLAGS="$CPPFLAGS_save"
+
+	if test "$ac_silc_libs" != "no"; then
+		SILC_LIBS="-L$ac_silc_libs"
+	fi
+	SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread -ldl"
+	AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
+fi
 AC_SUBST(SILC_LIBS)
+AC_SUBST(SILC_CFLAGS)
 
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")

--- a/src/gtkdialogs.c	Sat Aug 28 16:48:47 2004 +0000
+++ b/src/gtkdialogs.c	Sat Aug 28 19:09:38 2004 +0000
@@ -246,6 +246,7 @@
 	g_string_append(str,
 					"  Daniel 'datallah' Atallah<BR>"
 					"  Ka-Hing 'javabsp' Cheung<BR>"
+					"  Felipe 'shx' Contreras<BR>"
 					"  Decklin Foster<BR>"
 					"  Gary 'grim' Kramlich<BR>"
 					"  Robert 'Robot101' McQueen<BR>"

--- a/src/protocols/silc/Makefile.am	Sat Aug 28 16:48:47 2004 +0000
+++ b/src/protocols/silc/Makefile.am	Sat Aug 28 19:09:38 2004 +0000
@@ -10,7 +10,7 @@
 
 if STATIC_SILC
 
-st = -DGAIM_STATIC_PRPL $(SILC_INCLUDES)
+st = -DGAIM_STATIC_PRPL $(SILC_CFLAGS)
 noinst_LIBRARIES = libsilcgaim.a
 pkg_LTLIBRARIES =
 
@@ -20,7 +20,7 @@
 
 else
 
-st = $(SILC_INCLUDES)
+st = $(SILC_CFLAGS)
 pkg_LTLIBRARIES = libsilcgaim.la
 noinst_LIBRARIES =