diff options
| author | Guenter Knauf <fuankg@apache.org> | 2012-05-02 20:56:07 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2012-05-02 20:56:07 +0000 |
| commit | 9c5333c95019a070615cb68c8c2e8610fb8979f7 (patch) | |
| tree | 42742a0bf15a91885cfc903f1c57202201003ea9 /dbd | |
| parent | 4b2ed3427b49929af7b8a78cd649e768dbc6dd0e (diff) | |
| download | apr-9c5333c95019a070615cb68c8c2e8610fb8979f7.tar.gz | |
NetWare build tweaks to enable nlmconv linker.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1333202 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -rw-r--r-- | dbd/NWGNUdbdfreetds | 9 | ||||
| -rw-r--r-- | dbd/NWGNUdbdmysql | 7 | ||||
| -rw-r--r-- | dbd/NWGNUdbdpgsql | 8 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli2 | 12 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli3 | 10 |
5 files changed, 25 insertions, 21 deletions
diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds index 8692ff3bc..71af8d151 100644 --- a/dbd/NWGNUdbdfreetds +++ b/dbd/NWGNUdbdfreetds @@ -52,6 +52,8 @@ XCFLAGS += \ XDEFINES += \ -DAPU_HAVE_FREETDS=1 \ -DAPU_DSO_MODULE_BUILD \ + -DHAVE_SYBDB_H=1 \ + -DSYBDBLIB \ $(EOLIST) # @@ -61,7 +63,6 @@ XLFLAGS += \ $(EOLIST) XLFLAGS += \ - -l $(FREETDSSDK)/lib \ $(EOLIST) # @@ -236,13 +237,13 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @aprlib.imp \ - @libc.imp \ + @$(APR)/aprlib.imp \ + @$(NOVI)/libc.imp \ $(EOLIST) ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(notdir $(FREETDS_IMP)) \ + @$(FREETDS_IMP) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql index c3e9c811f..bc799eb52 100644 --- a/dbd/NWGNUdbdmysql +++ b/dbd/NWGNUdbdmysql @@ -65,7 +65,6 @@ XLFLAGS += \ $(EOLIST) XLFLAGS += \ - -l $(MYSQLSDK)/lib \ $(EOLIST) # @@ -240,13 +239,13 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @aprlib.imp \ - @libc.imp \ + @$(APR)/aprlib.imp \ + @$(NOVI)/libc.imp \ $(EOLIST) ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(notdir $(MYSQL_IMP)) \ + @$(MYSQL_IMP) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql index 05e67bcb0..61946df51 100644 --- a/dbd/NWGNUdbdpgsql +++ b/dbd/NWGNUdbdpgsql @@ -63,11 +63,9 @@ XLFLAGS += \ ifdef LINK_STATIC XLFLAGS += \ - -l $(PGSQLSDK)/lib \ $(EOLIST) else XLFLAGS += \ - -l $(PGSQLSDK)/imp \ $(EOLIST) endif @@ -243,13 +241,13 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @aprlib.imp \ - @libc.imp \ + @$(APR)/aprlib.imp \ + @$(NOVI)/libc.imp \ $(EOLIST) ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(notdir $(PGSQL_IMP)) \ + @$(PGSQL_IMP) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2 index 3caef7a48..8887a53ff 100644 --- a/dbd/NWGNUdbdsqli2 +++ b/dbd/NWGNUdbdsqli2 @@ -61,7 +61,6 @@ XLFLAGS += \ $(EOLIST) XLFLAGS += \ - -l $(SQLITE2SDK) \ $(EOLIST) # @@ -236,13 +235,18 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @aprlib.imp \ - @libc.imp \ + @$(APR)/aprlib.imp \ + @$(NOVI)/libc.imp \ + $(EOLIST) + +FILES_nlm_imports = \ + apr_dbd_mutex_lock \ + apr_dbd_mutex_unlock \ $(EOLIST) ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(notdir $(SQLITE2_IMP)) \ + @$(SQLITE2_IMP) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3 index e66f2347e..cf495d21c 100644 --- a/dbd/NWGNUdbdsqli3 +++ b/dbd/NWGNUdbdsqli3 @@ -61,7 +61,6 @@ XLFLAGS += \ $(EOLIST) XLFLAGS += \ - -l $(SQLITE3SDK) \ $(EOLIST) # @@ -236,15 +235,18 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @aprlib.imp \ - @libc.imp \ + @$(APR)/aprlib.imp \ + @$(NOVI)/libc.imp \ + $(EOLIST) + +FILES_nlm_imports = \ apr_dbd_mutex_lock \ apr_dbd_mutex_unlock \ $(EOLIST) ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(notdir $(SQLITE3_IMP)) \ + @$(SQLITE3_IMP) \ $(EOLIST) endif |