scim-1.4.7-syslibltdl.patch

   1 Index: scim-1.4.7/src/Makefile.am
   2 ===================================================================
   3 --- scim-1.4.7.orig/src/Makefile.am
   4 +++ scim-1.4.7/src/Makefile.am
   5 @@ -33,7 +33,7 @@ INCLUDES              = -I$(top_builddir) \
   6                           -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\"
   7
   8
   9 -noinst_HEADERS         = ltdl.h \
  10 +noinst_HEADERS         = \
  11                           scim_private.h \
  12                           scim_compose_key_data.h \
  13                           scim_keyboard_layout_data.h \
  14 @@ -84,11 +84,6 @@ libsciminclude_HEADERS       = scim.h \
  15                           scim_utility.h
  16
  17
  18 -noinst_LTLIBRARIES     = libltdlc.la
  19 -
  20 -libltdlc_la_SOURCES    = ltdl.cpp
  21 -libltdlc_la_LIBADD     = $(LIBADD_DL)
  22 -
  23  if SCIM_LD_VERSION_SCRIPT
  24  LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
  25  endif
  26 @@ -137,7 +132,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
  27                           @LTLIBINTL@ \
  28                           -lstdc++
  29
  30 -libscim@SCIM_EPOCH@_la_LIBADD  = libltdlc.la
  31 +libscim@SCIM_EPOCH@_la_LIBADD  = -lltdl
  32
  33
  34  bin_PROGRAMS           = scim scim-config-agent
  35 Index: scim-1.4.7/src/scim_module.cpp
  36 ===================================================================
  37 --- scim-1.4.7.orig/src/scim_module.cpp
  38 +++ scim-1.4.7/src/scim_module.cpp
  39 @@ -27,7 +27,9 @@
  40  #define Uses_STL_ALGORITHM
  41  #include "scim_private.h"
  42  #include "scim.h"
  43 -#include "ltdl.h"
  44 +extern "C" {
  45 +  #include <ltdl.h>
  46 +}
  47  #include <dirent.h>
  48  #include <sys/types.h>
  49  #include <sys/stat.h>
  50 Index: scim-1.4.7/configure.ac
  51 ===================================================================
  52 --- scim-1.4.7.orig/configure.ac
  53 +++ scim-1.4.7/configure.ac
  54 @@ -71,7 +71,6 @@ AM_GNU_GETTEXT
  55  # Init libtool
  56  AC_LIBTOOL_DLOPEN
  57  AC_PROG_LIBTOOL
  58 -AC_LIB_LTDL
  59  AC_SUBST(LIBTOOL_DEPS)
  60
  61  # libtool option to control which symbols are exported