manoj 99/12/05 01:09:17
Modified: src acinclude.m4
src/modules/standard Makefile.am
Log:
The possibility of a libenv module and a libenv system library (for
example) irks me. Take a page from PHP and make the module's library
names unique.
Revision Changes Path
1.4 +2 -2 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- acinclude.m4 1999/12/01 01:21:38 1.3
+++ acinclude.m4 1999/12/05 09:09:16 1.4
@@ -12,8 +12,8 @@
MOD_SUBDIRS="$MOD_SUBDIRS $1"
if test "$2" != "shared" -a "$2" != "yes"; then
libname=$(basename $1)
- _extlib="lib${libname}.a"
- MOD_LTLIBS="$MOD_LTLIBS modules/$1/lib${libname}.la"
+ _extlib="libapachemod_${libname}.a"
+ MOD_LTLIBS="$MOD_LTLIBS modules/$1/libapachemod_${libname}.la"
MOD_LIBS="$MOD_LIBS $1/$_extlib"
MOD_STATIC="$MOD_STATIC $1"
else
1.2 +2 -2 apache-2.0/src/modules/standard/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- Makefile.am 1999/11/29 23:46:58 1.1
+++ Makefile.am 1999/12/05 09:09:17 1.2
@@ -2,8 +2,8 @@
# by placing each module into its own subdirectory and placing a
# config.m4 to allow or disallow it in there.
-noinst_LTLIBRARIES = libstandard.la
-libstandard_la_SOURCES = \
+noinst_LTLIBRARIES = libapachemod_standard.la
+libapachemod_standard_la_SOURCES = \
mod_env.c mod_log_config.c mod_mime.c mod_negotiation.c \
mod_include.c mod_autoindex.c mod_dir.c mod_cgi.c mod_asis.c \
mod_imap.c mod_actions.c mod_speling.c mod_userdir.c mod_alias.c \