[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-upstream-fixes, updated. 3bb27317d2e41070ee40080b18e63f569c2ac79e

[Jörg Sommer]

The following commit has been merged in the jo-upstream-fixes branch:
commit 809f6de3d55f792a29594ebfbdb95a1c7b444a03
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Thu May 29 21:42:51 2008 +0200

    Insert DYNAMIC_LINK_FLAGS directly into LDFLAGS
    
    There's no need to carry these flags in a separate variable.

diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index cbc8e39..d146cf9 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -576,24 +576,22 @@ SLANG_DLL_CFLAGS=""
 
 case "$host_os" in
   *linux*|*gnu*|k*bsd*-gnu )
-    DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
     ELF_CC="\$(CC)"
     ELF_CFLAGS="\$(CFLAGS) -fPIC"
     ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
     ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
+    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
     ;;
   *solaris* )
     if test "$GCC" = yes
     then
-      DYNAMIC_LINK_FLAGS=""
       ELF_CC="\$(CC)"
       ELF_CFLAGS="\$(CFLAGS) -fPIC"
       ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-ztext -Wl,-h,\$(ELFLIB_MAJOR)"
       ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
       CC_SHARED="\$(CC) \$(CFLAGS) -G -fPIC"
     else
-      DYNAMIC_LINK_FLAGS=""
       ELF_CC="\$(CC)"
       ELF_CFLAGS="\$(CFLAGS) -K PIC"
       ELF_LINK="\$(CC) \$(LDFLAGS) -G -h\$(ELFLIB_MAJOR)"
@@ -605,14 +603,12 @@ case "$host_os" in
   *sco3.2v5* | *unixware-5* | *sco-sysv5uw7*)
      if test "$GCC" = yes
      then
-       DYNAMIC_LINK_FLAGS=""
        ELF_CC="\$(CC)"
        ELF_CFLAGS="\$(CFLAGS) -fPIC"
        ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-h,\$(ELFLIB_MAJOR)"
        ELF_DEP_LIBS=
        CC_SHARED="\$(CC) \$(CFLAGS) -G -fPIC"
      else
-       DYNAMIC_LINK_FLAGS=""
        ELF_CC="\$(CC)"
        ELF_CFLAGS="\$(CFLAGS) -K pic"
        # ELF_LINK="ld -G -z text -h#"
@@ -627,14 +623,12 @@ case "$host_os" in
      if test "$GCC" = yes
      then
        # not tested
-       DYNAMIC_LINK_FLAGS=""
        ELF_CC="\$(CC)"
        ELF_CFLAGS="\$(CFLAGS) -fPIC"
        ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-h,\$(ELFLIB_MAJOR)"
        ELF_DEP_LIBS=
        CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
      else
-       DYNAMIC_LINK_FLAGS=""
        ELF_CC="\$(CC)"
        ELF_CFLAGS="\$(CFLAGS)"     # default anyhow
        ELF_LINK="\$(CC) \$(LDFLAGS) -shared -o \$(ELFLIB_MAJOR)"
@@ -643,7 +637,6 @@ case "$host_os" in
      fi
      ;;
   *darwin* )
-     DYNAMIC_LINK_FLAGS=""
      ELF_CC="\$(CC)"
      ELF_CFLAGS="\$(CFLAGS) -fno-common"
      ELF_LINK="\$(CC) \$(LDFLAGS) -dynamiclib -install_name \$(install_lib_dir)/\$(ELFLIB_MAJOR) -compatibility_version \$(ELF_MAJOR_VERSION) -current_version \$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
@@ -667,7 +660,6 @@ case "$host_os" in
     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
     ;;
   *cygwin* )
-    DYNAMIC_LINK_FLAGS=""
     ELF_CC="\$(CC)"
     SLANG_DLL_CFLAGS="-DSLANG_DLL=1"
     ELF_CFLAGS="\$(CFLAGS) -DBUILD_DLL=1"
@@ -700,7 +692,6 @@ AC_SUBST(ELF_CFLAGS)
 AC_SUBST(ELF_LINK)
 AC_SUBST(ELF_LINK_CMD)
 AC_SUBST(ELF_DEP_LIBS)
-AC_SUBST(DYNAMIC_LINK_FLAGS)
 AC_SUBST(CC_SHARED)
 AC_SUBST(ELFLIB)
 AC_SUBST(ELFLIB_MAJOR)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index c3913f9..e8ab158 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -109,7 +109,7 @@ echo ""
 echo "You will need to edit src/Makefile if any of the following are not correct:"
 echo "        CC =" "$CC"
 echo "    CFLAGS =" "$CFLAGS"
-echo "   LDFLAGS =" "$LDFLAGS" "$DYNAMIC_LINK_FLAGS"
+echo "   LDFLAGS =" "$LDFLAGS"
 echo "  JED_ROOT =" "$JED_ROOT"
 echo ""
 echo "Also edit src/Makefile to enable:"
diff --git a/src/Makefile.in b/src/Makefile.in
index 8f3876f..10e53e3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,7 @@
 # C compiler and C flags
 CC = @CC@
 CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ @SLANG_DLL_CFLAGS@
-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS = @LDFLAGS@
 
 #---------------------------------------------------------------------------
 # Installation information.  All jed library files will be placed under

-- 
Debian packaging of JED