Interaction Effects in the Conductance of Quantum Wires: Crossover from weakly-disordered Fermi liquid to Luttinger liquid