[Pkg-jed-commit] [SCM] Debian packaging of JED branch, upstream-fixes, updated. 456f22085fafbdc310fed2c33a99d3d5c7476d36

[Jörg Sommer]

The following commit has been merged in the upstream-fixes branch:
commit e244a954931f453c0ee0ed5a012567f75d4b7ff7
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Fri May 30 00:26:13 2008 +0200

    Replace check for dlopen by check for SLang_init_import
    
    The function dlopen is not used directly in Jed, but the function
    SLang_init_import.

diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 1de8215..67daf07 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -541,25 +541,6 @@ dnl#}}}
 
 AC_DEFUN(JD_ELF_COMPILER, dnl#{{{
 [
-dnl #-------------------------------------------------------------------------
-dnl # Check for dynamic linker
-dnl #-------------------------------------------------------------------------
-DYNAMIC_LINK_LIB=""
-AC_CHECK_HEADER(dlfcn.h,[
-  AC_DEFINE(HAVE_DLFCN_H)
-  AC_CHECK_LIB(dl,dlopen,[
-    DYNAMIC_LINK_LIB="-ldl"
-    AC_DEFINE(HAVE_DLOPEN)
-   ],[
-    AC_CHECK_FUNC(dlopen,AC_DEFINE(HAVE_DLOPEN))
-    if test "$ac_cv_func_dlopen" != yes
-    then
-      AC_MSG_WARN(cannot perform dynamic linking)
-    fi
-   ])])
-AC_SUBST(DYNAMIC_LINK_LIB)
-
-
 if test "$GCC" = yes
 then
   if test X"$CFLAGS" = X
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 8eb32db..58ca1ae 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -79,6 +79,8 @@ JD_LARGE_FILE_SUPPORT
 JD_SET_OBJ_SRC_DIR
 JD_TERMCAP
 JD_WITH_LIBRARY(slang)
+AC_CHECK_LIB(slang, SLang_init_import, AC_DEFINE(JED_HAS_IMPORT, 1))
+dnl JD_FIND_SLANG
 JD_GCC_WARNINGS
 
 AC_ARG_ENABLE(xft,
diff --git a/src/Makefile.in b/src/Makefile.in
index 2d0dc5a..00d5ffc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -87,9 +87,6 @@ XINCLUDE = @X_CFLAGS@
 # Extra libraries needed by X and Network support on some systems
 X_XTRA_LIBS = @X_EXTRA_LIBS@
 
-# Libraries to support dynamic linking
-DL_LIB		= @DYNAMIC_LINK_LIB@
-
 # Anything else???
 OTHERLIBS = @LIBS@ -lm
 
@@ -99,8 +96,8 @@ OTHERLIBS = @LIBS@ -lm
 
 MIN_SLANG_VERSION = 20100
 MAX_SLANG_VERSION =
-XLIB = $(X_XTRA_LIBS) $(XLIBDIR) -lX11 $(TERMCAP_LIB) $(OTHERLIBS) $(DL_LIB)
-MISCLIBS = $(MOUSELIB) $(TERMCAP_LIB) $(X_XTRA_LIBS) $(OTHERLIBS) $(DL_LIB)
+XLIB = $(X_XTRA_LIBS) $(XLIBDIR) -lX11 $(TERMCAP_LIB) $(OTHERLIBS)
+MISCLIBS = $(MOUSELIB) $(TERMCAP_LIB) $(X_XTRA_LIBS) $(OTHERLIBS)
 
 ALL_CFLAGS = $(CFLAGS) -Dunix -DJED $(MOUSEDEFINES) $(SLANG_INC)
 CONFIG_H = config.h  
diff --git a/src/config.hin b/src/config.hin
index 7438665..e62ebb6 100644
--- a/src/config.hin
+++ b/src/config.hin
@@ -71,8 +71,6 @@
 
 #undef HAVE_PCRE_H
 
-#undef HAVE_DLOPEN
-
 #undef HAVE_GRANTPT
 
 #undef HAVE_UTIME
@@ -162,6 +160,12 @@
 /* Set this to 1 if the filesystem is case-sensitive */
 #define JED_FILE_PRESERVE_CASE 1
 
+/* Set JED_HAS_IMPORT if you want the ability to import modules into jed via
+ * the slang import statement.  This assumes that slang was compiled with
+ * such support.
+ */
+#undef JED_HAS_IMPORT
+
 #ifndef JED
 # define JED
 #endif
diff --git a/src/jed-feat.h b/src/jed-feat.h
index 10b1043..3852954 100644
--- a/src/jed-feat.h
+++ b/src/jed-feat.h
@@ -83,10 +83,4 @@
 # define JED_HAS_EMACS_LOCKING 0
 #endif
 
-/* Set JED_HAS_IMPORT if you want the ability to import modules into jed via
- * the slang import statement.  This assumes that slang was compiled with 
- * such support.
- */
-#define JED_HAS_IMPORT	1
-
 #endif
diff --git a/src/jedconf.h b/src/jedconf.h
index 8f31882..f599c29 100644
--- a/src/jedconf.h
+++ b/src/jedconf.h
@@ -141,10 +141,6 @@
 typedef int uid_t;
 typedef int gid_t;
 
-#ifdef _MSC_VER
-# define HAVE_DLOPEN 1
-#endif
-
 /* Finally, a reality check... */
 #ifdef REAL_UNIX_SYSTEM
 # undef REAL_UNIX_SYSTEM

-- 
Debian packaging of JED