diff options
author | cls%seawood.org <devnull@localhost> | 2001-02-23 06:44:40 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-02-23 06:44:40 +0000 |
commit | e916b1bee5c13995781fc845d079b891a7792505 (patch) | |
tree | 8dd23c765627fcd30eb3798d8b9511cdf7771a2c | |
parent | 7484bc5e572ed8aca60fd2ea6c7af1ec7fb4c3d0 (diff) | |
download | nspr-hg-e916b1bee5c13995781fc845d079b891a7792505.tar.gz |
Initial OS/2 nspr autoconf support. Bug #58804
Thanks to "Javier H Pedemonte" <pedemont@us.ibm.com> for the patch.
-rwxr-xr-x | build/autoconf/config.guess | 12 | ||||
-rwxr-xr-x | build/autoconf/config.sub | 4 | ||||
-rw-r--r-- | config/Makefile.in | 6 | ||||
-rw-r--r-- | config/autoconf.mk.in | 3 | ||||
-rw-r--r-- | config/rules.mk | 2 | ||||
-rwxr-xr-x | configure | 159 | ||||
-rw-r--r-- | configure.in | 76 | ||||
-rw-r--r-- | pr/src/md/os2/Makefile.in | 2 |
8 files changed, 225 insertions, 39 deletions
diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess index 5ce66fdb..6d5281f0 100755 --- a/build/autoconf/config.guess +++ b/build/autoconf/config.guess @@ -1194,11 +1194,13 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i?86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + *:OS/2:*:*) + if test "$VACPP" = "yes"; then + echo "i386-pc-os2_vacpp" + else + echo "i386-pc-os2_emx" + fi + exit 0;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub index 1e47930d..3875de91 100755 --- a/build/autoconf/config.sub +++ b/build/autoconf/config.sub @@ -995,6 +995,10 @@ case $os in -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; + -os2_emx) + ;; + -os2_vacpp) + ;; # First accept the basic system types. # The portable systems comes first. # Each alternative MUST END IN A *, to match a version number. diff --git a/config/Makefile.in b/config/Makefile.in index 880f3e6d..6cfe14df 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -90,10 +90,6 @@ XCFLAGS = $(OS_EXE_CFLAGS) XLDOPTS = -Zlinker /PM:VIO endif -ifeq ($(MOZ_OS2_TOOLS),VACPP) -OS_CFLAGS = $(OS_EXE_CFLAGS) -endif - include $(topsrcdir)/config/rules.mk PROGS = $(OBJDIR)/now$(PROG_SUFFIX) @@ -120,7 +116,7 @@ export:: $(TARGETS) $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(LINK) $(EXEFLAGS) $< + $(LD) $(EXEFLAGS) $< else $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@ endif diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index bae8076e..9e33b8a0 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -45,6 +45,8 @@ WINDRES = @WINDRES@ RC = @RC@ STRIP = @STRIP@ NSINSTALL = @NSINSTALL@ +FILTER = @FILTER@ +IMPLIB = @IMPLIB@ OS_CFLAGS = @CFLAGS@ $(DSO_CFLAGS) OS_CXXFLAGS = @CXXFLAGS@ $(DSO_CFLAGS) @@ -52,6 +54,7 @@ OS_LIBS = @OS_LIBS@ OS_LDFLAGS = @LDFLAGS@ OS_DLLFLAGS = @OS_DLLFLAGS@ DLLFLAGS = @DLLFLAGS@ +EXEFLAGS = @EXEFLAGS@ OPTIMIZER = @OPTIMIZER@ MKSHLIB = @MKSHLIB@ diff --git a/config/rules.mk b/config/rules.mk index 80f7027f..04462fda 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -275,7 +275,7 @@ $(LIBRARY): $(OBJS) @$(MAKE_OBJDIR) rm -f $@ ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(AR) $(subst /,\\,$(OBJS)) $(AR_EXTRA_ARGS) + $(AR) $(subst /,\\,$(OBJS)) $(AR_FLAGS) else ifdef USE_AUTOCONF $(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS) @@ -2434,7 +2434,7 @@ elif test "$OS_ARCH" = 'Windows_95'; then elif test "$OS_ARCH" = "CYGWIN_95-4.0"; then OS_ARCH='CYGWIN_NT-4.0' OS_TARGET=WIN95 -elif test "$OS_ARCH" = "OS2"; then +elif test "$OS_ARCH" = "OS_2"; then OS_ARCH=OS2 OS_TARGET=OS2 fi @@ -2528,6 +2528,8 @@ case "$host" in *-beos*) HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE" ;; +*os2*) + ;; *) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" ;; @@ -4008,6 +4010,105 @@ EOF CPU_ARCH=x86 ;; +*-os2*) + cat >> confdefs.h <<\EOF +#define XP_OS2 1 +EOF + + cat >> confdefs.h <<\EOF +#define BSD_SELECT 1 +EOF + + cat >> confdefs.h <<\EOF +#define XP_PC 1 +EOF + + cat >> confdefs.h <<\EOF +#define _PR_GLOBAL_THREADS_ONLY 1 +EOF + + OBJ_SUFFIX=obj + LIB_SUFFIX=lib + DLL_SUFFIX=dll + DLLTOOL='' + RC=rc.exe + PR_MD_ARCH_DIR=os2 + PROG_SUFFIX=.exe + NSINSTALL=nsinstall + + case "$target" in + *-os2_emx) + cat >> confdefs.h <<\EOF +#define XP_OS2_EMX 1 +EOF + + cat >> confdefs.h <<\EOF +#define OS2 1 +EOF + + AR=emxomfar + AR_FLAGS='-p256 r $@' + CFLAGS="-Zmtd -Zomf" + HOST_CFLAGS="$CFLAGS" + CXXFLAGS="-Zmtd -Zomf" + OS_LIBS="-lsocket -lemxio" + LD='$(CC)' + IMPLIB='emximp -o' + FILTER='emxexp' + _OPTIMIZE_FLAGS=-O3 + _DEBUG_FLAGS=-g + if test -n "$MOZ_DEBUG"; then + DLLFLAGS='-g' + EXEFLAGS='-g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@' + else + DLLFLAGS= + EXEFLAGS='-Zmtd -o $@' + fi + ;; + *-os2_vacpp) + cat >> confdefs.h <<\EOF +#define XP_OS2_VACPP 1 +EOF + + cat >> confdefs.h <<\EOF +#define OS2 4 +EOF + + cat >> confdefs.h <<\EOF +#define TCPV40HDRS 1 +EOF + + cat >> confdefs.h <<\EOF +#define _X86_ 1 +EOF + + AR=-ilib + AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)' + CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl-' + HOST_CFLAGS="$CFLAGS" + OS_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Ge- /Tl-' + OS_EXE_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Ge+ /Tl-' + CXXFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl-' + OS_LIBS='so32dll.lib tcp32dll.lib' + LD='-ilink' + LDFLAGS='/FREE /DE /NOE /LINENUMBERS /nologo' + MKSHLIB='$(LD) $(DSO_LDOPTS)' + IMPLIB='implib -nologo -noignorecase' + FILTER='cppfilt -q -B -P' + _OPTIMIZE_FLAGS=/O+ + _DEBUG_FLAGS=/Ti+ + if test -n "$MOZ_DEBUG"; then + DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo /DEBUG /NOE' + EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo /DEBUG /NOE' + else + DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' + EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' + fi + ;; + esac + + ;; + *) cat >> confdefs.h <<\EOF #define XP_UNIX 1 @@ -4024,12 +4125,12 @@ fi if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4028: checking for dlopen" >&5 +echo "configure:4129: 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 4033 "configure" +#line 4134 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4052,7 +4153,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4157: \"$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 @@ -4071,7 +4172,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4075: checking for dlopen in -ldl" >&5 +echo "configure:4176: 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 @@ -4079,7 +4180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4083 "configure" +#line 4184 "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 @@ -4090,7 +4191,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4195: \"$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 @@ -4117,7 +4218,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:4121: checking how to run the C preprocessor" >&5 +echo "configure:4222: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4132,13 +4233,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 4136 "configure" +#line 4237 "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:4142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4243: \"$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 : @@ -4149,13 +4250,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 4153 "configure" +#line 4254 "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:4159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4260: \"$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 : @@ -4166,13 +4267,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 4170 "configure" +#line 4271 "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:4176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4277: \"$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 : @@ -4198,13 +4299,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:4202: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4303: 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 4208 "configure" +#line 4309 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4222,7 +4323,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4226 "configure" +#line 4327 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4246,12 +4347,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4250: checking for $ac_func" >&5 +echo "configure:4351: 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 4255 "configure" +#line 4356 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4274,7 +4375,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4379: \"$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 @@ -4305,7 +4406,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4309: checking for pthread_create in -lpthreads" >&5 +echo "configure:4410: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4327,7 +4428,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4331: checking for pthread_create in -lpthread" >&5 +echo "configure:4432: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4349,7 +4450,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4353: checking for pthread_create in -lc_r" >&5 +echo "configure:4454: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4371,7 +4472,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4375: checking for pthread_create in -lc" >&5 +echo "configure:4476: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4521,7 +4622,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:4525: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4626: 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 @@ -4537,7 +4638,7 @@ echo "configure:4525: 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:4541: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4642: 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 @@ -4786,6 +4887,9 @@ fi + + + MAKEFILES=" Makefile config/Makefile @@ -5036,6 +5140,8 @@ s%@OS_TEST@%$OS_TEST%g s%@DEFINES@%$DEFINES%g s%@AR_FLAGS@%$AR_FLAGS%g s%@ASFLAGS@%$ASFLAGS%g +s%@FILTER@%$FILTER%g +s%@IMPLIB@%$IMPLIB%g s%@OS_LIBS@%$OS_LIBS%g s%@RESOLVE_LINK_SYMBOLS@%$RESOLVE_LINK_SYMBOLS%g s%@AIX_LINK_OPTS@%$AIX_LINK_OPTS%g @@ -5050,6 +5156,7 @@ s%@OPTIMIZER@%$OPTIMIZER%g s%@RC@%$RC%g s%@CPU_ARCH_TAG@%$CPU_ARCH_TAG%g s%@DLLFLAGS@%$DLLFLAGS%g +s%@EXEFLAGS@%$EXEFLAGS%g s%@OS_DLLFLAGS@%$OS_DLLFLAGS%g CEOF diff --git a/configure.in b/configure.in index 605b4f3f..c34bd189 100644 --- a/configure.in +++ b/configure.in @@ -356,7 +356,7 @@ elif test "$OS_ARCH" = 'Windows_95'; then elif test "$OS_ARCH" = "CYGWIN_95-4.0"; then OS_ARCH='CYGWIN_NT-4.0' OS_TARGET=WIN95 -elif test "$OS_ARCH" = "OS2"; then +elif test "$OS_ARCH" = "OS_2"; then OS_ARCH=OS2 OS_TARGET=OS2 fi @@ -454,6 +454,8 @@ case "$host" in *-beos*) HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE" ;; +*os2*) + ;; *) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" ;; @@ -1364,6 +1366,75 @@ mips-sony-newsos*) CPU_ARCH=x86 ;; +*-os2*) + AC_DEFINE(XP_OS2) + AC_DEFINE(BSD_SELECT) + AC_DEFINE(XP_PC) + AC_DEFINE(_PR_GLOBAL_THREADS_ONLY) + OBJ_SUFFIX=obj + LIB_SUFFIX=lib + DLL_SUFFIX=dll + DLLTOOL='' + RC=rc.exe + PR_MD_ARCH_DIR=os2 + PROG_SUFFIX=.exe + NSINSTALL=nsinstall + + case "$target" in + *-os2_emx) + AC_DEFINE(XP_OS2_EMX) + AC_DEFINE(OS2) + AR=emxomfar + AR_FLAGS='-p256 r $@' + CFLAGS="-Zmtd -Zomf" + HOST_CFLAGS="$CFLAGS" + CXXFLAGS="-Zmtd -Zomf" + OS_LIBS="-lsocket -lemxio" + LD='$(CC)' + IMPLIB='emximp -o' + FILTER='emxexp' + _OPTIMIZE_FLAGS=-O3 + _DEBUG_FLAGS=-g + if test -n "$MOZ_DEBUG"; then + DLLFLAGS='-g' + EXEFLAGS='-g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@' + else + DLLFLAGS= + EXEFLAGS='-Zmtd -o $@' + fi + ;; + *-os2_vacpp) + AC_DEFINE(XP_OS2_VACPP) + AC_DEFINE(OS2,4) + AC_DEFINE(TCPV40HDRS) + AC_DEFINE(_X86_) + AR=-ilib + AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)' + CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl-' + HOST_CFLAGS="$CFLAGS" + OS_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Ge- /Tl-' + OS_EXE_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Ge+ /Tl-' + CXXFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl-' + OS_LIBS='so32dll.lib tcp32dll.lib' + LD='-ilink' + LDFLAGS='/FREE /DE /NOE /LINENUMBERS /nologo' + MKSHLIB='$(LD) $(DSO_LDOPTS)' + IMPLIB='implib -nologo -noignorecase' + FILTER='cppfilt -q -B -P' + _OPTIMIZE_FLAGS=/O+ + _DEBUG_FLAGS=/Ti+ + if test -n "$MOZ_DEBUG"; then + DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo /DEBUG /NOE' + EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo /DEBUG /NOE' + else + DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' + EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' + fi + ;; + esac + + ;; + *) AC_DEFINE(XP_UNIX) ;; @@ -1791,6 +1862,8 @@ AC_SUBST(WINDRES) AC_SUBST(RANLIB) AC_SUBST(PERL) AC_SUBST(STRIP) +AC_SUBST(FILTER) +AC_SUBST(IMPLIB) AC_SUBST(OS_LIBS) AC_SUBST(RESOLVE_LINK_SYMBOLS) @@ -1807,6 +1880,7 @@ AC_SUBST(OPTIMIZER) AC_SUBST(RC) AC_SUBST(CPU_ARCH_TAG) AC_SUBST(DLLFLAGS) +AC_SUBST(EXEFLAGS) AC_SUBST(OS_DLLFLAGS) dnl ======================================================== diff --git a/pr/src/md/os2/Makefile.in b/pr/src/md/os2/Makefile.in index 07cf6e74..c21ed5da 100644 --- a/pr/src/md/os2/Makefile.in +++ b/pr/src/md/os2/Makefile.in @@ -44,7 +44,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ |