BuildSystem: fixed configure --debug + Xcode

- only effects users building w/ Xcode from terminal or Xcode.app who need debug libhb.

Bug details:
- shunting through Xcode causes a re-configure to give GNUmakefile the 'Xcode' environment.
- re-configure simply clobbered CONF.args thus losing effect of initial --debug option.
- solution is to pass CONF.args to re-configure.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2244 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 19 insertions, 9 deletions

diff --git a/macosx/module.defs b/macosx/module.defs
index 75b9655ae..61a287366 100644
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -39,6 +39,7 @@ MACOSX.XCODE = $(strip \
         EXTERNAL_PREFIX='$(XCODE.external.prefix)' \
         EXTERNAL_JOBS='$(BUILD.jobs)' \
         EXTERNAL_METHOD='$(CONF.method)' \
+        EXTERNAL_CONFARGS='$(CONF.args)' \
         EXTERNAL_GOALS='$(3)' \
         EXTERNAL_VARS='$(-*-command-variables-*-)' \
         $(2) )
diff --git a/make/configure.py b/make/configure.py
index c984ccc3b..3a462a322 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1091,7 +1091,7 @@ try:
     for arg in sys.argv[1:]:
         if arg == '--launch':
             continue
-        args.append( "'%s'" % (arg.replace("'", '%c%c%c%c%c' % (0x27,0x22,0x27,0x22,0x27))) )
+        args.append( arg )
     doc.add( 'CONF.args', ' '.join( args ))
 
     doc.addBlank()
diff --git a/make/xcodemake b/make/xcodemake
index fde684cdf..2c6c1a80b 100755
--- a/make/xcodemake
+++ b/make/xcodemake
@@ -17,24 +17,34 @@ if [ $EXTERNAL_METHOD != 'xcode' -o ! -f $EXTERNAL_BUILD/GNUmakefile ]; then
     ## compute --arch value based on Xcode configuration naming convention
     case "$CONFIGURATION" in
     *.i386)
-        args="--arch=i386"
+        arch="--arch=i386"
         ;;
     *.x86_64)
-        args="--arch=x86_64"
+        arch="--arch=x86_64"
         ;;
     *.ppc)
-        args="--arch=ppc"
+        arch="--arch=ppc"
         ;;
     *.ppc64)
-        args="--arch=ppc64"
+        arch="--arch=ppc64"
         ;;
     *)
-        args=
+        arch=
+        ;;
+    esac
+
+    case "$CONFIGURATION" in
+    debug*)
+        debug="--debug=max"
+        ;;
+    *)
+        debug=
         ;;
     esac
 
     ## invoke configure with (hidden) option which indicates conf performed by xcode
-    $EXTERNAL_SRC/configure --force --build=$EXTERNAL_BUILD --conf-method=xcode PATH=$PATH $args
+    $EXTERNAL_SRC/configure --force --build=$EXTERNAL_BUILD $arch $debug \
+        --conf-method=xcode PATH=$PATH $EXTERNAL_CONFARGS
 fi
 
 ## safeguard against passing blank value which would result in unlimited jobs
@@ -64,7 +74,6 @@ case "$spec" in
         else
             goals="$EXTERNAL_GOALS"
         fi
-        vars="$EXTERNAL_VARS"
         ;;
     libhb:clean)
         goals=libhb.clean
@@ -80,4 +89,4 @@ esac
 
 ## handoff
 set -x
-make -C $EXTERNAL_BUILD BUILD.method=xcode $jobs $goals $vars
+make -C $EXTERNAL_BUILD BUILD.method=xcode $jobs $goals $EXTERNAL_VARS