diff options
author | cls%seawood.org <devnull@localhost> | 2001-04-05 03:11:03 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-04-05 03:11:03 +0000 |
commit | 52aa60f8946de54144cdae8df0971faf0d869a37 (patch) | |
tree | 16a9e219874bbb1649e47842583a2bbff60b7807 | |
parent | 86d8fced39c7f02e03c7921ce66305653b068180 (diff) | |
download | nspr-hg-52aa60f8946de54144cdae8df0971faf0d869a37.tar.gz |
Add |real_install| target. Change MOD_VERSION to MOD_MAJOR_VERSION. Add nspr-config file.
-rw-r--r-- | config/Makefile.in | 2 | ||||
-rw-r--r-- | config/autoconf.mk.in | 7 | ||||
-rw-r--r-- | config/rules.mk | 12 | ||||
-rwxr-xr-x | configure | 199 | ||||
-rw-r--r-- | configure.in | 29 | ||||
-rw-r--r-- | lib/ds/Makefile.in | 2 | ||||
-rw-r--r-- | lib/libc/src/Makefile.in | 2 | ||||
-rw-r--r-- | lib/msgc/src/Makefile.in | 4 | ||||
-rw-r--r-- | lib/msgc/tests/Makefile.in | 4 | ||||
-rw-r--r-- | lib/prstreams/Makefile.in | 4 | ||||
-rw-r--r-- | lib/prstreams/tests/testprstrm/Makefile.in | 30 | ||||
-rw-r--r-- | lib/tests/Makefile.in | 36 | ||||
-rw-r--r-- | pr/include/Makefile.in | 3 | ||||
-rw-r--r-- | pr/include/md/Makefile.in | 11 | ||||
-rw-r--r-- | pr/include/obsolete/Makefile.in | 5 | ||||
-rw-r--r-- | pr/include/private/Makefile.in | 5 | ||||
-rw-r--r-- | pr/src/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/cplus/tests/Makefile.in | 26 | ||||
-rw-r--r-- | pr/src/md/unix/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/misc/Makefile.in | 2 | ||||
-rw-r--r-- | pr/tests/Makefile.in | 14 | ||||
-rw-r--r-- | pr/tests/w16gui/Makefile.in | 4 |
22 files changed, 214 insertions, 193 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index c2a4fa49..bce82500 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -29,7 +29,7 @@ INTERNAL_TOOLS = 1 # autoconf.mk must be deleted last (from the top-level directory) # because it is included by every makefile. -DIST_GARBAGE = nsprincl.mk nsprincl.sh +DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config include $(topsrcdir)/config/config.mk diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index fa5a34aa..9d493d9a 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -7,7 +7,7 @@ MOZILLA_CLIENT = @MOZILLA_CLIENT@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@ +includedir = @includedir@/nspr libdir = @libdir@ dist_prefix = @dist_prefix@ @@ -22,9 +22,12 @@ OBJDIR = @OBJDIR@ OBJ_SUFFIX = @OBJ_SUFFIX@ LIB_SUFFIX = @LIB_SUFFIX@ DLL_SUFFIX = @DLL_SUFFIX@ -MOD_VERSION = @NSPR_VERSION@ MOD_NAME = @NSPR_MODNAME@ +MOD_MAJOR_VERSION = @MOD_MAJOR_VERSION@ +MOD_MINOR_VERSION = @MOD_MINOR_VERSION@ +MOD_REVISION_VERSION = @MOD_REVISION_VERSION@ + LIBNSPR = @LIBNSPR@ LIBPLC = @LIBPLC@ diff --git a/config/rules.mk b/config/rules.mk index 20cd44d3..2e623a75 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -185,6 +185,18 @@ distclean:: rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) +$(LOOP_OVER_DIRS) +real_install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) +ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) +endif +ifdef RELEASE_HEADERS + $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir) +endif +ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir) +endif + +$(LOOP_OVER_DIRS) + release:: export ifdef RELEASE_BINS @echo "Copying executable programs and scripts to release directory" @@ -677,7 +677,9 @@ cat >> confdefs.h <<\EOF EOF -NSPR_VERSION=4 +MOD_MAJOR_VERSION=4 +MOD_MINOR_VERSION=0 +MOD_REVISION_VERSION=1 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -696,8 +698,8 @@ OBJDIR=. OBJDIR_NAME=. NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file -LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_VERSION)' -LIBPLC='-L$(dist_libdir) -lplc$(MOD_VERSION)' +LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' +LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' RESOLVE_LINK_SYMBOLS= @@ -860,7 +862,7 @@ if test -z "$SKIP_PATH_CHECKS"; then # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. set dummy $WHOAMI whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:864: checking for $ac_word" >&5 +echo "configure:866: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -925,14 +927,14 @@ if test "$target" != "$host"; then _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:929: checking for $host compiler" >&5 +echo "configure:931: checking for $host compiler" >&5 if test -z "$HOST_CC"; then for ac_prog in gcc cc /usr/ucb/cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:936: checking for $ac_word" >&5 +echo "configure:938: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,16 +981,16 @@ test -n "$HOST_CC" || HOST_CC="""" LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:983: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:985: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <<EOF -#line 985 "configure" +#line 987 "configure" #include "confdefs.h" int main() { return(0); ; return 0; } EOF -if { (eval echo configure:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1009,7 +1011,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1013: checking for $ac_word" >&5 +echo "configure:1015: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1044,7 +1046,7 @@ test -n "$CC" || CC="echo" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1048: checking for $ac_word" >&5 +echo "configure:1050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1074,7 +1076,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1078: checking for $ac_word" >&5 +echo "configure:1080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1125,7 +1127,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1129: checking for $ac_word" >&5 +echo "configure:1131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1157,7 +1159,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1161: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1163: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1168,12 +1170,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1172 "configure" +#line 1174 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1199,12 +1201,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1203: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1205: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1208: checking whether we are using GNU C" >&5 +echo "configure:1210: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1213,7 +1215,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1232,7 +1234,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1236: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1238: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1269,7 +1271,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1273: checking for $ac_word" >&5 +echo "configure:1275: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1308,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1310: checking for $ac_word" >&5 +echo "configure:1312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1338,7 +1340,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1342: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1344: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1349,12 +1351,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1353 "configure" +#line 1355 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1380,12 +1382,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1384: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1386: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1389: checking whether we are using GNU C++" >&5 +echo "configure:1391: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1394,7 +1396,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1413,7 +1415,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1417: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1419: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1450,7 +1452,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1454: checking for $ac_word" >&5 +echo "configure:1456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1487,7 +1489,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1491: checking for $ac_word" >&5 +echo "configure:1493: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1524,7 +1526,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1528: checking for $ac_word" >&5 +echo "configure:1530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1561,7 +1563,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1565: checking for $ac_word" >&5 +echo "configure:1567: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1598,7 +1600,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1602: checking for $ac_word" >&5 +echo "configure:1604: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1635,7 +1637,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1639: checking for $ac_word" >&5 +echo "configure:1641: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1672,7 +1674,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1676: checking for $ac_word" >&5 +echo "configure:1678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1710,7 +1712,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1714: checking for $ac_word" >&5 +echo "configure:1716: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1742,7 +1744,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1746: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1748: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1753,12 +1755,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1757 "configure" +#line 1759 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1784,12 +1786,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1788: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1790: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1793: checking whether we are using GNU C++" >&5 +echo "configure:1795: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1798,7 +1800,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1817,7 +1819,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1821: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1823: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1854,7 +1856,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1858: checking for $ac_word" >&5 +echo "configure:1860: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1884,7 +1886,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1888: checking for $ac_word" >&5 +echo "configure:1890: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1935,7 +1937,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1939: checking for $ac_word" >&5 +echo "configure:1941: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1967,7 +1969,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1978,12 +1980,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1982 "configure" +#line 1984 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2009,12 +2011,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2015: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2018: checking whether we are using GNU C" >&5 +echo "configure:2020: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2023,7 +2025,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2042,7 +2044,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2046: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2048: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2077,7 +2079,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2081: checking for $ac_word" >&5 +echo "configure:2083: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2109,7 +2111,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2113: checking for $ac_word" >&5 +echo "configure:2115: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2150,7 +2152,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2154: checking for $ac_word" >&5 +echo "configure:2156: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2191,7 +2193,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2195: checking for $ac_word" >&5 +echo "configure:2197: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2232,7 +2234,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2236: checking for $ac_word" >&5 +echo "configure:2238: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2273,7 +2275,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2277: checking for $ac_word" >&5 +echo "configure:2279: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2314,7 +2316,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2318: checking for $ac_word" >&5 +echo "configure:2320: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2380,7 +2382,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2384: checking for $ac_word" >&5 +echo "configure:2386: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2643,7 +2645,7 @@ EOF DSO_LDOPTS= USE_PTHREADS=1 AIX_LINK_OPTS='-bnso -berok' - LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_VERSION)_shr' + LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)_shr' ;; aix4.3*) cat >> confdefs.h <<\EOF @@ -3393,11 +3395,11 @@ EOF if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" - LIBNSPR='$(dist_libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' else - LIBNSPR='$(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' fi fi # GNU_CC @@ -4228,8 +4230,8 @@ EOF DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' fi - LIBNSPR='$(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' ;; esac @@ -4251,12 +4253,12 @@ fi if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4255: checking for dlopen" >&5 +echo "configure:4257: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4260 "configure" +#line 4262 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4279,7 +4281,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4298,7 +4300,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4302: checking for dlopen in -ldl" >&5 +echo "configure:4304: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4306,7 +4308,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4310 "configure" +#line 4312 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4317,7 +4319,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4344,7 +4346,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:4348: checking how to run the C preprocessor" >&5 +echo "configure:4350: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4359,13 +4361,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 4363 "configure" +#line 4365 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -4376,13 +4378,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 4380 "configure" +#line 4382 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -4393,13 +4395,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 4397 "configure" +#line 4399 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -4425,13 +4427,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4429: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4431: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 4435 "configure" +#line 4437 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4449,7 +4451,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4453 "configure" +#line 4455 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4473,12 +4475,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4477: checking for $ac_func" >&5 +echo "configure:4479: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4482 "configure" +#line 4484 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4501,7 +4503,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4532,7 +4534,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4536: checking for pthread_create in -lpthreads" >&5 +echo "configure:4538: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4554,7 +4556,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4558: checking for pthread_create in -lpthread" >&5 +echo "configure:4560: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4576,7 +4578,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4580: checking for pthread_create in -lc_r" >&5 +echo "configure:4582: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4598,7 +4600,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4602: checking for pthread_create in -lc" >&5 +echo "configure:4604: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4748,7 +4750,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:4752: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4754: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -4764,7 +4766,7 @@ echo "configure:4752: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:4768: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4770: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5029,12 +5031,15 @@ fi + + MAKEFILES=" Makefile config/Makefile config/autoconf.mk config/nsprincl.mk config/nsprincl.sh +config/nspr-config lib/Makefile lib/ds/Makefile lib/libc/Makefile @@ -5264,7 +5269,9 @@ s%@USE_NATIVE_THREADS@%$USE_NATIVE_THREADS%g s%@USE_NSPR_THREADS@%$USE_NSPR_THREADS%g s%@LIBNSPR@%$LIBNSPR%g s%@LIBPLC@%$LIBPLC%g -s%@NSPR_VERSION@%$NSPR_VERSION%g +s%@MOD_MAJOR_VERSION@%$MOD_MAJOR_VERSION%g +s%@MOD_MINOR_VERSION@%$MOD_MINOR_VERSION%g +s%@MOD_REVISION_VERSION@%$MOD_REVISION_VERSION%g s%@NSPR_MODNAME@%$NSPR_MODNAME%g s%@MDCPUCFG_H@%$MDCPUCFG_H%g s%@MOZ_WIN32_TARGET@%$MOZ_WIN32_TARGET%g @@ -5403,7 +5410,7 @@ cat >> $CONFIG_STATUS <<EOF EOF cat >> $CONFIG_STATUS <<\EOF - +chmod +x config/nspr-config exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/configure.in b/configure.in index 45acc481..3294c63c 100644 --- a/configure.in +++ b/configure.in @@ -32,7 +32,9 @@ AC_DEFINE(USE_AUTOCONF) dnl ======================================================== dnl = Defaults dnl ======================================================== -NSPR_VERSION=4 +MOD_MAJOR_VERSION=4 +MOD_MINOR_VERSION=0 +MOD_REVISION_VERSION=1 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -51,8 +53,8 @@ OBJDIR=. OBJDIR_NAME=. NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file -LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_VERSION)' -LIBPLC='-L$(dist_libdir) -lplc$(MOD_VERSION)' +LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' +LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' dnl Link in libraries necessary to resolve all symbols for shared libs RESOLVE_LINK_SYMBOLS= @@ -526,7 +528,7 @@ case "$target" in DSO_LDOPTS= USE_PTHREADS=1 AIX_LINK_OPTS='-bnso -berok' - LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_VERSION)_shr' + LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)_shr' ;; aix4.3*) AC_DEFINE(AIX_HAVE_ATOMIC_OP_H) @@ -1003,11 +1005,11 @@ case "$target" in if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" - LIBNSPR='$(dist_libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' else - LIBNSPR='$(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' fi fi # GNU_CC @@ -1529,8 +1531,8 @@ mips-sony-newsos*) DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' fi - LIBNSPR='$(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' - LIBPLC='$(dist_libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' ;; esac @@ -1943,7 +1945,9 @@ AC_SUBST(USE_NSPR_THREADS) AC_SUBST(LIBNSPR) AC_SUBST(LIBPLC) -AC_SUBST(NSPR_VERSION) +AC_SUBST(MOD_MAJOR_VERSION) +AC_SUBST(MOD_MINOR_VERSION) +AC_SUBST(MOD_REVISION_VERSION) AC_SUBST(NSPR_MODNAME) AC_SUBST(MDCPUCFG_H) AC_SUBST(MOZ_WIN32_TARGET) @@ -2006,6 +2010,7 @@ config/Makefile config/autoconf.mk config/nsprincl.mk config/nsprincl.sh +config/nspr-config lib/Makefile lib/ds/Makefile lib/libc/Makefile @@ -2045,4 +2050,4 @@ if test -n "$USE_CPLUS"; then MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile" fi -AC_OUTPUT([$MAKEFILES]) +AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config]) diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index ed6f2764..f300d04b 100644 --- a/lib/ds/Makefile.in +++ b/lib/ds/Makefile.in @@ -56,7 +56,7 @@ EXTRA_LIBS += $(OS_LIBS) endif LIBRARY_NAME = plds -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_HEADERS = $(HEADERS) RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index 3a0e3dc2..c7b56c1a 100644 --- a/lib/libc/src/Makefile.in +++ b/lib/libc/src/Makefile.in @@ -46,7 +46,7 @@ CSRCS =\ $(NULL) LIBRARY_NAME = plc -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_LIBS = $(TARGETS) diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index b33bf8d6..685d028d 100644 --- a/lib/msgc/src/Makefile.in +++ b/lib/msgc/src/Makefile.in @@ -40,7 +40,7 @@ CSRCS += unixgc.c endif endif -NSPR_VERSION = $(MOD_VERSION) +NSPR_VERSION = $(MOD_MAJOR_VERSION) EXTRA_LIBS = $(LIBNSPR) @@ -56,7 +56,7 @@ DLLBASE=/BASE:0x30000000 endif # WINNT LIBRARY_NAME = msgc -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_LIBS = $(TARGETS) diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in index c61f73a7..bd437a79 100644 --- a/lib/msgc/tests/Makefile.in +++ b/lib/msgc/tests/Makefile.in @@ -52,8 +52,8 @@ INCLUDES = -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. LDOPTS = -L$(dist_libdir) -NSPR_VERSION = $(MOD_VERSION) -GC_VERSION = $(MOD_VERSION) +NSPR_VERSION = $(MOD_MAJOR_VERSION) +GC_VERSION = $(MOD_MAJOR_VERSION) LIBPR = -lnspr$(NSPR_VERSION) LIBPLC = -lplc$(NSPR_VERSION) LIBGC = -lmsgc$(GC_VERSION) diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index 85405e7b..7bfc3358 100644 --- a/lib/prstreams/Makefile.in +++ b/lib/prstreams/Makefile.in @@ -68,7 +68,7 @@ CXXSRCS = \ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) LIBRARY_NAME = prstrms -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_HEADERS = $(HEADERS) RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) @@ -112,7 +112,7 @@ ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif ifeq ($(OS_ARCH),BeOS) - EXTRA_LIBS = -lstdc++.r4 -L$(dist_libdir) -lnspr$(MOD_VERSION) + EXTRA_LIBS = -lstdc++.r4 -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION) endif ifeq ($(OS_ARCH), UNIXWARE) diff --git a/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in index 4e97bed6..8c1f938f 100644 --- a/lib/prstreams/tests/testprstrm/Makefile.in +++ b/lib/prstreams/tests/testprstrm/Makefile.in @@ -51,21 +51,21 @@ INCLUDES = -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. LDOPTS = -L$(dist_libdir) -LIBPR = -lnspr$(MOD_VERSION) -LIBPRSTRMS = -lprstrms$(MOD_VERSION) +LIBPR = -lnspr$(MOD_MAJOR_VERSION) +LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else - LIBPR = $(dist_libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) endif endif endif @@ -73,8 +73,8 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -100,8 +100,8 @@ endif ifeq ($(OS_ARCH),AIX) LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) -LIBPR = -lnspr$(MOD_VERSION)_shr -LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr +LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr +LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)_shr else LDOPTS += -brtl EXTRA_LIBS = -ldl @@ -131,8 +131,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(dist_libdir)/libnspr$(MOD_VERSION).a -LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_VERSION).a +LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a +LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -189,7 +189,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 34bb5b56..99b86089 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -58,25 +58,25 @@ INCLUDES = -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. LDOPTS = -L$(dist_libdir) -LIBPR = -lnspr$(MOD_VERSION) -LIBPLC = -lplc$(MOD_VERSION) -LIBPLDS = -lplds$(MOD_VERSION) +LIBPR = -lnspr$(MOD_MAJOR_VERSION) +LIBPLC = -lplc$(MOD_MAJOR_VERSION) +LIBPLDS = -lplds$(MOD_MAJOR_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPLC= $(dist_libdir)/plc$(MOD_VERSION).lib - LIBPLDS= $(dist_libdir)/plds$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(dist_libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(dist_libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else - LIBPR = $(dist_libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(dist_libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(dist_libdir)/libplds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLC= $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(dist_libdir)/libplds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) endif endif endif @@ -84,9 +84,9 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPLC = $(dist_libdir)/plc$(MOD_VERSION).lib - LIBPLDS= $(dist_libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -122,8 +122,8 @@ endif # AIX ifeq ($(OS_ARCH),AIX) LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib -LIBPR = -lnspr$(MOD_VERSION)_shr -LIBPLC = -lplc$(MOD_VERSION)_shr +LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr +LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr endif # Solaris @@ -193,7 +193,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/include/Makefile.in b/pr/include/Makefile.in index 55fbcfd0..7ef8196f 100644 --- a/pr/include/Makefile.in +++ b/pr/include/Makefile.in @@ -37,6 +37,3 @@ include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir) -ifeq ($(MOZ_BITS),16) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL) -endif diff --git a/pr/include/md/Makefile.in b/pr/include/md/Makefile.in index b6ec234e..2f3962c7 100644 --- a/pr/include/md/Makefile.in +++ b/pr/include/md/Makefile.in @@ -30,11 +30,6 @@ CONFIGS = $(wildcard $(srcdir)/*.cfg) include $(topsrcdir)/config/rules.mk export:: $(MDCPUCFG_H) -ifeq ($(MOZ_BITS),16) - cp $(dist_includedir)/$(MDCPUCFG_H) $(dist_includedir)/prcpucfg.h - $(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL) - mv -f $(dist_includedir)/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h -else $(INSTALL) -m 444 $(CONFIGS) $(dist_includedir)/md $(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(dist_includedir) ifneq ($(OS_ARCH),OpenVMS) @@ -45,7 +40,11 @@ else rm -f $(dist_includedir)/prcpucfg.h ln -fs $(srcdir)/$(MDCPUCFG_H) $(dist_includedir)/prcpucfg.h endif -endif + +real_install:: + $(NSINSTALL) -D $(DESTDIR)$(includedir)/md + cp $(srcdir)/$(MDCPUCFG_H) $(DESTDIR)$(includedir)/prcpucfg.h + $(NSINSTALL) -t -m 644 $(CONFIGS) $(HEADERS) $(DESTDIR)$(includedir)/md release:: export @echo "Copying machine-dependent prcpucfg.h" diff --git a/pr/include/obsolete/Makefile.in b/pr/include/obsolete/Makefile.in index 24b84637..fd33428b 100644 --- a/pr/include/obsolete/Makefile.in +++ b/pr/include/obsolete/Makefile.in @@ -31,10 +31,9 @@ HEADERS = $(wildcard $(srcdir)/*.h) RELEASE_HEADERS = $(HEADERS) RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete +includedir := $(includedir)/obsolete + include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir)/obsolete -ifeq ($(MOZ_BITS),16) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete -endif diff --git a/pr/include/private/Makefile.in b/pr/include/private/Makefile.in index b3dfc684..8325ef72 100644 --- a/pr/include/private/Makefile.in +++ b/pr/include/private/Makefile.in @@ -32,10 +32,9 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h +includedir := $(includedir)/private + include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir)/private -ifeq ($(MOZ_BITS),16) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private -endif diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 272f2189..55e96907 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -265,7 +265,7 @@ include $(srcdir)/bthreads/objs.mk endif LIBRARY_NAME = nspr -LIBRARY_VERSION = $(MOD_VERSION) +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) RELEASE_LIBS = $(TARGETS) @@ -284,7 +284,7 @@ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/incl TINC = $(OBJDIR)/_pr_bld.h ifeq ($(OS_TARGET),OS2) -PROD = nspr$(MOD_VERSION).$(DLL_SUFFIX) +PROD = nspr$(MOD_MAJOR_VERSION).$(DLL_SUFFIX) else PROD = $(notdir $(SHARED_LIBRARY)) endif diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index eddc2ce2..371da8a6 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/pr/src/cplus/tests/Makefile.in @@ -57,8 +57,8 @@ INCLUDES = -I.. -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. LDOPTS = -L$(dist_libdir) -LIBPR = -lnspr$(MOD_VERSION) -LIBPL = -lplc$(MOD_VERSION) +LIBPR = -lnspr$(MOD_MAJOR_VERSION) +LIBPL = -lplc$(MOD_MAJOR_VERSION) ifeq ($(OS_ARCH), IRIX) LDOPTS += -rpath $(PWD)/$(dist_libdir) -rdata_shared @@ -108,20 +108,20 @@ endif # SunOS ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPL = $(dist_libdir)/plc$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPL = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(dist_libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPL = $(dist_libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib - LIBPLC = $(dist_libdir)/plc$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -143,8 +143,8 @@ endif ifeq ($(OS_ARCH),AIX) LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) - LIBPR = -lnspr$(MOD_VERSION)_shr - LIBPLC = -lplc$(MOD_VERSION)_shr + LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr + LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr else LDOPTS += -brtl EXTRA_LIBS = -ldl @@ -166,8 +166,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(dist_libdir)/libnspr$(MOD_VERSION).a -LIBPL = $(dist_libdir)/libplc$(MOD_VERSION).a +LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a +LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -224,7 +224,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index 7c013cf4..3a1cd020 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -45,7 +45,7 @@ ifeq ($(OS_ARCH),SunOS) ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(OS_TEST),sun4u) LIBRARY_NAME = $(ULTRASPARC_LIBRARY) - LIBRARY_VERSION = $(MOD_VERSION) + LIBRARY_VERSION = $(MOD_MAJOR_VERSION) ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX))) TARGETS += $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY) diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index 694fe405..6ad93101 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -62,7 +62,7 @@ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/incl DEFINES += -D_NSPR_BUILD_ -RELEASE_BINS = compile-et.pl prerr.properties +#RELEASE_BINS = compile-et.pl prerr.properties include $(topsrcdir)/config/rules.mk diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 2fb1a88a..80e3738a 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -247,8 +247,8 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE))) - LIBNSPR = $(dist_libdir)/libnspr$(MOD_VERSION).a - LIBPLC = $(dist_libdir)/libplc$(MOD_VERSION).a + LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a + LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a EXTRA_LIBS = -lc_r else LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) @@ -267,8 +267,8 @@ endif ifeq ($(OS_ARCH),AIX) LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) - LIBNSPR = -lnspr$(MOD_VERSION)_shr - LIBPLC = -lplc$(MOD_VERSION)_shr + LIBNSPR = -lnspr$(MOD_MAJOR_VERSION)_shr + LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr else LDOPTS += -brtl EXTRA_LIBS = -ldl @@ -336,8 +336,8 @@ ifeq ($(OS_ARCH), NEWS-OS) # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. #export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) - LIBNSPR = $(dist_libdir)/libnspr$(MOD_VERSION).a - LIBPLC = $(dist_libdir)/libplc$(MOD_VERSION).a + LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a + LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv endif @@ -450,7 +450,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/tests/w16gui/Makefile.in b/pr/tests/w16gui/Makefile.in index 7db1c70d..05c2e57b 100644 --- a/pr/tests/w16gui/Makefile.in +++ b/pr/tests/w16gui/Makefile.in @@ -38,8 +38,8 @@ CSRCS = poppad.c \ INCLUDES = -I$(dist_includedir) -LIBPR = $(dist_libdir)/nspr$(MOD_VERSION).lib -LIBPLDS = $(dist_libdir)/plds$(MOD_VERSION).lib +LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib +LIBPLDS = $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib TARGETS = $(OBJDIR)/poppad.exe OS_CFLAGS = $(OS_EXE_CFLAGS) |