taught it how to generate OpenBSD shared libraries

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 84faa2f5c37d04b0a0cd0290016c919aa2ce8ba2..28153d1c0379218337be6208820de5e6d5ab15e1 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+1999-04-12 Nathan Bryant <bryant@cs.usm.maine.edu>
+       * configure.in, Makefile.in: taught it how to generate OpenBSD shared
+         libraries
+
 1999-04-11 Nathan Bryant <bryant@cs.usm.maine.edu>
        * configure.in: another OpenBSD fix, but we're still not quite there yet
        * serv_chat.c: warning fix

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 00dd4adb2e32f28620ad754c6c51f68086057e61..c5ff3689d0c42f44aaba4e66f30f35f1a5b7e2cb 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -39,6 +39,7 @@ DEFS=@DEFS@
 CPPFLAGS=@CPPFLAGS@ -I.
 CFLAGS=@CFLAGS@
 CC=@CC@
+LINK_SHARED=@LINK_SHARED@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
 SERVER_LDFLAGS=@SERVER_LDFLAGS@
@@ -112,7 +113,7 @@ citserver: citserver.ro user_ops.ro support.ro room_ops.ro file_ops.ro \
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
 
 modules/serv_chat.so: serv_chat.mo
-       $(CC) -shared -o modules/serv_chat.so serv_chat.mo
+       $(LINK_SHARED) -o modules/serv_chat.so serv_chat.mo
 
 modules/serv_chat.mo: serv_chat.mo
        ln -f serv_chat.mo modules
@@ -121,19 +122,19 @@ modules/serv_chat.mo: serv_chat.mo
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) $(PICFLAGS) -DPIC -c $< -o $@
 
 modules/serv_test.so: serv_test.mo
-       $(CC) -shared -o modules/serv_test.so serv_test.mo
+       $(LINK_SHARED) -o modules/serv_test.so serv_test.mo
 
 modules/serv_test.mo: serv_test.mo
        ln -f serv_test.mo modules
 
 modules/serv_upgrade.so: serv_upgrade.mo
-       $(CC) -shared -o modules/serv_upgrade.so serv_upgrade.mo
+       $(LINK_SHARED) -o modules/serv_upgrade.so serv_upgrade.mo
 
 modules/serv_upgrade.mo: serv_upgrade.mo
        ln -f serv_upgrade.mo modules
 
 modules/serv_expire.so: serv_expire.mo
-       $(CC) -shared -o modules/serv_expire.so serv_expire.mo
+       $(LINK_SHARED) -o modules/serv_expire.so serv_expire.mo
 
 modules/serv_expire.mo: serv_expire.mo
        ln -f serv_expire.mo modules

diff --git a/citadel/configure.in b/citadel/configure.in
index 7da590a853eda2a7aaaa7b53324e50cd42c429cc..7ddcdbd50855c7e591196bc61e6b20bd06a20d0c 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -21,6 +21,7 @@ TARGETS=client
 AC_CANONICAL_HOST
 SO=.so
 PTHREAD_DEFS=-D_REENTRANT
+LINK_SHARED='$(CC) -shared'
 case "$host" in
        dnl BSDI 3.0 wants relocatable object modules instead of shared libs
        dnl for dlopen(), and has a wrapper script to link with shared libs.
@@ -52,6 +53,7 @@ case "$host" in
                SERVER_LDFLAGS=-pthread
                check_pthread=no
                PTHREAD_DEFS=-pthread
+               LINK_SHARED="ld -x -Bshareable"
        ;;
        *-*-cygwin32)
                SUFFIX=.exe
@@ -236,6 +238,7 @@ AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)
 AC_SUBST(SERVER_LDFLAGS)
 AC_SUBST(PICFLAGS)
+AC_SUBST(LINK_SHARED)
 AC_SUBST(SUFFIX)
 AC_SUBST(PTHREAD_DEFS)
 AC_CONFIG_HEADER(sysdep.h)