Sophie

Sophie

distrib > Fedora > 16 > x86_64 > media > updates-src > by-pkgid > 5807e9a96bec93be396de59c6fdc8f18 > files > 3

hercules-3.08-1.fc16.src.rpm

diff -up hercules-3.08/bootstrap.c.ltdl hercules-3.08/bootstrap.c
--- hercules-3.08/bootstrap.c.ltdl	2012-11-18 11:43:30.000000000 +0100
+++ hercules-3.08/bootstrap.c	2012-12-08 21:46:53.000000000 +0100
@@ -13,7 +13,7 @@
 #include "hstdinc.h"
 #include "hercules.h"
 #if defined(HDL_USE_LIBTOOL)
-#include "ltdl.h"
+#include <ltdl.h>
 #endif
 
 #if !defined( _MSVC_ )
diff -up hercules-3.08/decNumber/Makefile.am.ltdl hercules-3.08/decNumber/Makefile.am
--- hercules-3.08/decNumber/Makefile.am.ltdl	2012-12-08 21:47:13.000000000 +0100
+++ hercules-3.08/decNumber/Makefile.am	2012-12-08 21:47:33.000000000 +0100
@@ -37,13 +37,11 @@ else
 endif
 
 if OPTION_DYNAMIC_LOAD
-  LTDL  	 = ../ltdl.c
   LIB_LD_FLAGS    = -export-dynamic  \
 		   $(XSTATIC)       \
 		   -no-undefined    \
 		   -avoid-version
 else
-  LTDL  	 =
   LIB_LD_FLAGS    = $(XSTATIC)    \
 		   -no-undefined \
 		   -avoid-version
diff -up hercules-3.08/decNumber/Makefile.in.ltdl hercules-3.08/decNumber/Makefile.in
--- hercules-3.08/decNumber/Makefile.in.ltdl	2012-12-08 21:47:20.000000000 +0100
+++ hercules-3.08/decNumber/Makefile.in	2012-12-08 21:48:13.000000000 +0100
@@ -261,8 +261,6 @@ decNumber_SRC = decContext.c \
 
 @BUILD_SHARED_FALSE@XSTATIC = -static
 @BUILD_SHARED_TRUE@XSTATIC = 
-@OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
 @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
 @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
diff -up hercules-3.08/herclin.c.ltdl hercules-3.08/herclin.c
--- hercules-3.08/herclin.c.ltdl	2012-09-07 18:21:13.000000000 +0200
+++ hercules-3.08/herclin.c	2012-12-08 21:46:53.000000000 +0100
@@ -33,7 +33,7 @@
 /* This must be included if HDL uses the   */
 /* libtool ltdl convenience library        */
 
-#include "ltdl.h"
+#include <ltdl.h>
 #endif
 
 
diff -up hercules-3.08/Makefile.am.ltdl hercules-3.08/Makefile.am
--- hercules-3.08/Makefile.am.ltdl	2012-11-21 12:38:00.000000000 +0100
+++ hercules-3.08/Makefile.am	2012-12-08 21:46:53.000000000 +0100
@@ -81,7 +81,7 @@ lns=@LN_S@
 
 SUBDIRS = decNumber m4 po util html man . crypto
 
-LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
+LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
 
@@ -169,7 +169,6 @@ endif
 
 if OPTION_DYNAMIC_LOAD
   DYNSRC         =
-  LTDL           = ltdl.c
 
   DYNMOD_LD_FLAGS = -module         \
                    -no-undefined    \
@@ -188,7 +187,6 @@ if OPTION_DYNAMIC_LOAD
                    -avoid-version
 else
   DYNSRC         = $(dyndev_SRC)
-  LTDL           =
   DYNMOD_LD_FLAGS =
   DYNMOD_LD_ADD =
   LIB_LD_FLAGS    = $(XSTATIC)    \
@@ -366,8 +364,7 @@ endif
                         memrchr.c    \
                         parser.c     \
                         pttrace.c    \
-                        $(FTHREADS)  \
-                        $(LTDL)
+                        $(FTHREADS)
 
   libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
 
@@ -443,8 +440,7 @@ endif
                              memrchr.c        \
                              $(dynamic_SRC)   \
                              $(extra_SRC)     \
-                             $(dyndev_SRC)    \
-                             ltdl.c
+                             $(dyndev_SRC)
 
   libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
 
@@ -730,7 +726,6 @@ noinst_HEADERS = hostinfo.h     \
                  hdl.h          \
                  crypto.h       \
                  sockdev.h      \
-                 ltdl.h         \
                  herc_getopt.h  \
                  service.h      \
                  chsc.h         \
diff -up hercules-3.08/Makefile.in.ltdl hercules-3.08/Makefile.in
--- hercules-3.08/Makefile.in.ltdl	2012-12-05 19:18:07.000000000 +0100
+++ hercules-3.08/Makefile.in	2012-12-08 21:46:53.000000000 +0100
@@ -370,13 +370,12 @@ libherct_la_LINK = $(LIBTOOL) --tag=CC $
 libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
 am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
 	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
-	parser.c pttrace.c fthreads.c ltdl.c
+	parser.c pttrace.c fthreads.c
 am__objects_5 = fthreads.lo
 @BUILD_FTHREADS_TRUE@am__objects_6 = $(am__objects_5)
-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo
 am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
 	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
-	parser.lo pttrace.lo $(am__objects_6) $(am__objects_7)
+	parser.lo pttrace.lo $(am__objects_6)
 libhercu_la_OBJECTS = $(am_libhercu_la_OBJECTS)
 libhercu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -765,7 +764,7 @@ AUTOMAKE_OPTIONS = foreign 1.5
 ACLOCAL_AMFLAGS = -I m4
 lns = @LN_S@
 SUBDIRS = decNumber m4 po util html man . crypto
-LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
+LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
 @BUILD_HERCIFC_FALSE@HERCIFC = 
 @BUILD_HERCIFC_TRUE@HERCIFC = hercifc
@@ -833,8 +832,6 @@ dyndev_SRC = commadpt.c  \
 @BUILD_SHARED_TRUE@XSTATIC = 
 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
-@OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c
 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
 @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
@@ -983,8 +980,7 @@ libhercu_la_SOURCES = version.c    \
                         memrchr.c    \
                         parser.c     \
                         pttrace.c    \
-                        $(FTHREADS)  \
-                        $(LTDL)
+                        $(FTHREADS)
 
 libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
 libhercu_la_LIBADD = $(LDADD) libhercs.la
@@ -1058,8 +1054,7 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR
                              memrchr.c        \
                              $(dynamic_SRC)   \
                              $(extra_SRC)     \
-                             $(dyndev_SRC)    \
-                             ltdl.c
+                             $(dyndev_SRC)
 
 libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
 libherc_la_LIBADD = libhercs.la     \
@@ -1302,7 +1297,6 @@ noinst_HEADERS = hostinfo.h     \
                  hdl.h          \
                  crypto.h       \
                  sockdev.h      \
-                 ltdl.h         \
                  herc_getopt.h  \
                  service.h      \
                  chsc.h         \
@@ -1711,7 +1705,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@
diff -up hercules-3.08/hdl.h.module-suffix hercules-3.08/hdl.h
--- hercules-3.08/hdl.h.module-suffix	2012-09-07 18:21:13.000000000 +0200
+++ hercules-3.08/hdl.h	2012-12-08 22:17:55.000000000 +0100
@@ -167,7 +167,7 @@ typedef struct _DLLENT {
   #if defined(_MSVC_)
     #define HDL_MODULE_SUFFIX   ".dll"
   #else
-    #define HDL_MODULE_SUFFIX   ".la"
+    #define HDL_MODULE_SUFFIX   ".so"
   #endif
 #endif