make ext/re play nice with DEBUGGING override

Message-Id: <a05101002b74ca0013cf5@[192.168.56.160]>

p4raw-id: //depot/perl@10562

diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index 537704c..9706cc5 100644 (file)
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -4,13 +4,23 @@ use Config;
 
 my $object = 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)';
 
+my $defines = '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG';
+
+# We need to pretend that DEBUGGING is in effect even if it's
+# not but we need to remember that we pretended so we can avoid
+# linking to things that aren't there.
+
+if ($Config{'usedebugging_perl'} ne 'Y') {
+  $defines .= ' -DDEBUGGING -DWAS_NOT_DEBUGGING';
+}
+
 WriteMakefile(
     NAME               => 're',
     VERSION_FROM       => 're.pm',
     MAN3PODS           => {},  # Pods will be built by installman.
     XSPROTOARG         => '-noprototypes',
     OBJECT             => $object,
-    DEFINE             => '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG',
+    DEFINE             => $defines,
     clean              => { FILES => '*$(OBJ_EXT) *.c ../../lib/re.pm' },
 );
 

diff --git a/ext/re/re.xs b/ext/re/re.xs
index cc4dc69..faab0b3 100644 (file)
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,9 +1,3 @@
-/* We need access to debugger hooks */
-#ifndef DEBUGGING
-#  define DEBUGGING
-#  define WAS_NOT_DEBUGGING
-#endif
-
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"