Project: Subversion

Revision: 32914

Author: zhakov

Date: 05 Sep 2008 07:36:23

• /trunk/gen-make.py

  ......	@@ -241,12 +241,10 @@
  241	241	if args:
  242	242	conf = args[0]
  243	243
  	244	# First merge options with previously saved to gen-make.opts if --reload
  	245	# options used
  244	246	for opt, val in opts:
  245		if opt == '-s':
  246		skip = 1
  247		elif opt == '-t':
  248		gentype = val
  249		elif opt == '--reload':
  	247	if opt == '--reload':
  250	248	prev_conf = ConfigParser.ConfigParser()
  251	249	prev_conf.read('gen-make.opts')
  252	250	for opt, val in prev_conf.items('options'):
  ......	@@ -255,6 +253,14 @@
  255	253	del prev_conf
  256	254	else:
  257	255	rest.add(opt, val)
  	256
  	257	# Parse options list
  	258	for opt, val in rest.list:
  	259	if opt == '-s':
  	260	skip = 1
  	261	elif opt == '-t':
  	262	gentype = val
  	263	else:
  258	264	if opt == '--with-httpd':
  259	265	rest.add('--with-apr', os.path.join(val, 'srclib', 'apr'))
  260	266	rest.add('--with-apr-util', os.path.join(val, 'srclib', 'apr-util'))