summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1999-10-08 13:51:34 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1999-10-08 13:51:34 +0000
commitc88be79fccb80fda2b9ad01fb180cda4529bca38 (patch)
treeabeb79248c207f0d5e445f13d8f58dd5229d5715 /ext
parent4e774c8419d3eafeeaf002f3bd7b53c6ac99d4c1 (diff)
downloadperl-c88be79fccb80fda2b9ad01fb180cda4529bca38.tar.gz
The second cut at AIX C++ extension troubles.
p4raw-id: //depot/cfgperl@4318
Diffstat (limited to 'ext')
-rw-r--r--ext/DynaLoader/dl_aix.xs8
-rw-r--r--ext/DynaLoader/hints/aix.pl8
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs
index e3a4113f8b..798ed58d31 100644
--- a/ext/DynaLoader/dl_aix.xs
+++ b/ext/DynaLoader/dl_aix.xs
@@ -33,10 +33,12 @@
* of load() and unload() from libC and libC_r need to be used,
* otherwise statics in the extensions won't get initialized right.
* -- Stephanie Beals <bealzy@us.ibm.com> */
-#ifdef USE_xlC /* The define comes, when it comes, from hints/aix.pl. */
-# define LOAD loadAndInitialize
+#ifdef USE_libC /* The define comes, when it comes, from hints/aix.pl. */
+# define LOAD loadAndInit
# define UNLOAD terminateAndUnload
-# include <load.h>
+# ifdef USE_load_h
+# include <load.h>
+# endif
#else
# define LOAD load
# define UNLOAD unload
diff --git a/ext/DynaLoader/hints/aix.pl b/ext/DynaLoader/hints/aix.pl
index e972bfe934..4225979320 100644
--- a/ext/DynaLoader/hints/aix.pl
+++ b/ext/DynaLoader/hints/aix.pl
@@ -1,12 +1,10 @@
# See dl_aix.xs for details.
use Config;
if ($Config{libs} =~ /-lC/ && -f '/lib/libC.a') {
- $self->{CCFLAGS} = $Config{ccflags} . ' -DUSE_xlC';
+ $self->{CCFLAGS} = $Config{ccflags} . ' -DUSE_libC';
if (-f '/usr/ibmcxx/include/load.h') {
- $self->{CCFLAGS} .= ' -I/usr/ibmcxx/include';
+ $self->{CCFLAGS} .= ' -I/usr/ibmcxx/include -DUSE_load_h';
} elsif (-f '/usr/lpp/xlC/include/load.h') {
- $self->{CCFLAGS} .= ' -I/usr/lpp/xlC/include';
- } else {
- # Hoping that <load.h> will be found somehow.
+ $self->{CCFLAGS} .= ' -I/usr/lpp/xlC/include -DUSE_load_h';
}
}