[Cockroach-devel] Preventing some disruption

[Luca Saiu]

Hello José and Giuseppe.

I fixed a few minor bit rot problems in cockroach; notice that not every
test passes and my solution for libdl may not be the most portable.  At
least the thing compiles on a modern GNU/Linux and we can play with it.

It is a very fun little project.

-- 
Luca Saiu
* My personal web site:  http://ageinghacker.net
* Jitter:                http://ageinghacker.net/projects/jitter
* GNU epsilon:           http://www.gnu.org/software/epsilon

I support everyone's freedom of mocking any opinion or belief, no
matter how deeply held, with open disrespect and the same unrelented
enthusiasm of a toddler who has just learned the word "poo".

commit c0fc9e8fd93a2cf0ef5f065c8cc06d773bd4ddf0
Author: Luca Saiu <positron@gnu.org>
Date:   Tue Nov 30 23:01:02 2021 +0100

    fix minor bit rot
    
    * Makefile.am.common (AC_PREREQ): Bump minor version, to satisfy recent 
Gnulib.
    * configure.ac: Check for a library containing dlopen.
    * src/Makefile.am (cockroach_LDFLAGS): Remove hardwired -ldl (which ended 
up in
    the wrong part of the command line anyway).

diff --git a/Makefile.am.common b/Makefile.am.common
index 283eaf2..a7f78f5 100644
--- a/Makefile.am.common
+++ b/Makefile.am.common
@@ -13,4 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Some source files are in subdirectories.
+AUTOMAKE_OPTIONS = subdir-objects
+
 plugindir = $(pkglibdir)/plugins
diff --git a/configure.ac b/configure.ac
index 9497c5b..2f0e0d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AM_INIT_AUTOMAKE([dist-xz])
 AM_CONFIG_HEADER(src/config.h)
 
 # Minimum Autoconf version required.
-AC_PREREQ(2.60)
+AC_PREREQ(2.64)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -58,6 +58,9 @@ AM_CONDITIONAL([ROACH_ARCH_SPARC64],[test "$ROACH_ARCH" = 
"sparc64"])
 AC_PROG_LIBTOOL
 LT_INIT([dlopen])
 
+# We use dlopen.
+AC_SEARCH_LIBS([dlopen], [dl])
+
 # GNU help2man creates man pages from --help output; in many cases, this
 # is sufficient, and obviates the need to maintain man pages separately.
 # However, this means invoking executables, which we generally cannot do
diff --git a/src/Makefile.am b/src/Makefile.am
index 24a81c7..b70cae7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,8 +46,6 @@ endif
 
 cockroach_SOURCES = cockroach.c
 
-cockroach_LDFLAGS = -ldl
-
 cockroach_LDADD = libroach.la @LIBINTL@ $(top_builddir)/lib/libcockroach.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib \

signature.asc
Description: PGP signature