diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 0a30626ac5af..69b0cbef81b6 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -71,8 +71,10 @@ OS_CXXFLAGS = @CXXFLAGS@ OS_CFLAGS += $(DSO_CFLAGS) OS_CXXFLAGS += $(DSO_CFLAGS) +OS_LDFLAGS = @LDFLAGS@ + OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) -OS_LIBS = @LDFLAGS@ @LIBS@ +OS_LIBS = @LIBS@ ACDEFINES = @DEFS@ XCFLAGS = @XCFLAGS@ @@ -168,6 +170,7 @@ MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ LIBS_PATH = @LIBS_PATH@ COMPILER_DEPEND = @COMPILER_DEPEND@ +MDDEPDIR := @MDDEPDIR@ # Pulled these out of configure.in, # so undefine them now instead of subst diff --git a/config/config.mk b/config/config.mk index 26376c23e350..df0a2736c85a 100644 --- a/config/config.mk +++ b/config/config.mk @@ -359,6 +359,8 @@ CXXFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CXXFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) NOMD_CFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) NOMD_CXXFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CXXFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) +LDFLAGS = $(OS_CFLAGS) + # # Include the binary distrib stuff, if necessary. #