[PATCH 09/10] configure: allow picking up a dedicated dwarf version from command line

[Eric Pouech]

- added support in CROSSDEBUG for choosing which dwarf version is
  used for cross compiling Wine
- added DEBUGFORMAT option to pick dwarf version for regular compilation

Default for both is still 2

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 configure.ac |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 56ef99f2d4c..7ab5bc77fcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1036,16 +1036,20 @@ then
         then
           for ac_flag in $CROSSCFLAGS; do
             case $ac_flag in
-             -gdwarf*)    CROSSDEBUG=dwarf ;;
+             -gdwarf*)    CROSSDEBUG=$ac_flag ;;
              -gcodeview)  CROSSDEBUG=pdb ;;
              -g)          CROSSDEBUG=${CROSSDEBUG:-dwarf} ;;
             esac
           done
         fi
         case $CROSSDEBUG in
-          *dwarf)  WINE_TRY_CROSSCFLAGS([-gdwarf-2])
-                   WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
-          pdb)     WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
+          *dwarf-3)        WINE_TRY_CROSSCFLAGS([-gdwarf-3])
+                           WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
+          *dwarf-4)        WINE_TRY_CROSSCFLAGS([-gdwarf-4])
+                           WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
+          *dwarf|*dwarf-2) WINE_TRY_CROSSCFLAGS([-gdwarf-2])
+                           WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
+          pdb)             WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
         esac
 
         WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")])
@@ -2040,9 +2044,10 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
   esac
 
   dnl Default to dwarf-2 debug info
+  AC_SUBST(DEBUGFORMAT)
   for ac_flag in $CFLAGS; do
     case $ac_flag in
-      -g) WINE_TRY_CFLAGS([-gdwarf-2])
+      -g) WINE_TRY_CFLAGS([-g${DEBUGFORMAT:-dwarf-2}])
           WINE_TRY_CFLAGS([-gstrict-dwarf]) ;;
     esac
   done