Sophie

Sophie

distrib > Fedora > 14 > i386 > by-pkgid > f58da25ad92554b5322ac3a540e4fed2 > files > 2

libtlen-0-0.10.20060309.fc14.src.rpm

diff -up libtlen-20060309/configure.expat libtlen-20060309/configure
--- libtlen-20060309/configure.expat	2006-03-09 19:31:11.000000000 +0100
+++ libtlen-20060309/configure	2010-11-14 01:09:56.000000000 +0100
@@ -3034,6 +3034,74 @@ if test $ac_cv_lib_m_floor = yes; then
   LIBS="$LIBS -lm"
 fi
 
+echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexpat  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XML_ParserCreate ();
+int
+main ()
+{
+XML_ParserCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_expat_XML_ParserCreate=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+  LIBS="$LIBS -lexpat"
+fi
+
+
 
 CFLAGS_LIBTLEN="$CFLAGS"
 LIBS_LIBTLEN="$LIBS"
diff -up libtlen-20060309/configure.in.expat libtlen-20060309/configure.in
--- libtlen-20060309/configure.in.expat	2004-11-12 11:46:55.000000000 +0100
+++ libtlen-20060309/configure.in	2010-11-14 01:06:36.000000000 +0100
@@ -40,6 +40,7 @@ AC_SUBST(install_static, "install-static
 AC_CHECK_LIB(nsl, t_accept, LIBS="$LIBS -lnsl")
 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 AC_CHECK_LIB(m, floor, LIBS="$LIBS -lm")
+AC_CHECK_LIB(expat, XML_ParserCreate, LIBS="$LIBS -lexpat")
 
 CFLAGS_LIBTLEN="$CFLAGS"
 LIBS_LIBTLEN="$LIBS"
diff -up libtlen-20060309/lib/hashtable.c.expat libtlen-20060309/lib/hashtable.c
--- libtlen-20060309/lib/hashtable.c.expat	2004-11-12 11:46:59.000000000 +0100
+++ libtlen-20060309/lib/hashtable.c	2010-11-14 01:02:45.000000000 +0100
@@ -5,8 +5,6 @@
  *
  */
 
-#include "xmldef.h"
-
 #ifdef XML_UNICODE_WCHAR_T
 #ifndef XML_UNICODE
 #define XML_UNICODE
diff -up libtlen-20060309/lib/libtlen.h.expat libtlen-20060309/lib/libtlen.h
--- libtlen-20060309/lib/libtlen.h.expat	2005-06-11 23:50:40.000000000 +0200
+++ libtlen-20060309/lib/libtlen.h	2010-11-14 01:02:45.000000000 +0100
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <time.h>
-#include "xmlparse.h"
+#include <expat.h>
 #include "str.h"
 
 // Coby sie g++ kompilowalo
diff -up libtlen-20060309/lib/Makefile.in.expat libtlen-20060309/lib/Makefile.in
--- libtlen-20060309/lib/Makefile.in.expat	2010-11-14 01:02:45.000000000 +0100
+++ libtlen-20060309/lib/Makefile.in	2010-11-14 01:02:45.000000000 +0100
@@ -23,7 +23,7 @@ RANLIB = @RANLIB@
 STRIP = @STRIP@
 LN_S = @LN_S@
 
-OBJS = hashtable.o pool.o rate.o snprintf.o str.o xmlnode.o xmlparse.o xmlrole.o xmltok.o auth.o sockets.o expat.o roster.o message.o events.o utils.o libtlen.o pubdir.o hub.o groupchat.o
+OBJS = hashtable.o pool.o rate.o snprintf.o str.o xmlnode.o auth.o sockets.o expat.o roster.o message.o events.o utils.o libtlen.o pubdir.o hub.o groupchat.o
 
 SHAREDMM = libtlen.so
 SHAREDM = $(SHAREDMM).$(VERSION_MAJOR)