From 7e31f07e05ec9e8a2278889cd5a43359cc3c000c Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 6 Jun 2012 23:44:49 +0000
Subject: [PATCH] Removed inclusion of <proto/xxx_au.h>. Auto-opening works
 without it. I had drawn wrong conclusions because the tests printed the
 libbase.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44973 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 test/bz2/version.c               | 1 -
 test/z/version.c                 | 1 -
 workbench/libs/bz2/bzlib.h       | 4 ----
 workbench/libs/bz2/mmakefile.src | 2 +-
 workbench/libs/expat/lib/expat.h | 4 ----
 workbench/libs/z/mmakefile.src   | 2 +-
 workbench/libs/z/zlib.h          | 4 ----
 7 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/test/bz2/version.c b/test/bz2/version.c
index 00d224a037..d460fe5b49 100644
--- a/test/bz2/version.c
+++ b/test/bz2/version.c
@@ -3,7 +3,6 @@
 
 int main(void)
 {
-    printf("BZ2Base %p\n", BZ2Base);
     printf("Version %s\n", BZ2_bzlibVersion());
     return 0;
 }
diff --git a/test/z/version.c b/test/z/version.c
index 5711cbeb5f..5e5d970ff1 100644
--- a/test/z/version.c
+++ b/test/z/version.c
@@ -3,7 +3,6 @@
 
 int main(void)
 {
-    printf("ZBase %p\n", ZBase);
     printf("Version %s\n", zlibVersion());
     return 0;
 }
diff --git a/workbench/libs/bz2/bzlib.h b/workbench/libs/bz2/bzlib.h
index 4f025a951b..8277123da8 100644
--- a/workbench/libs/bz2/bzlib.h
+++ b/workbench/libs/bz2/bzlib.h
@@ -271,10 +271,6 @@ BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
    );
 #endif
 
-#if defined(__AROS__) && !defined(AROS_BZ2_STATICLIB)
-#   include <proto/bz2_au.h>
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/workbench/libs/bz2/mmakefile.src b/workbench/libs/bz2/mmakefile.src
index 8e296fb418..2cf232bf56 100644
--- a/workbench/libs/bz2/mmakefile.src
+++ b/workbench/libs/bz2/mmakefile.src
@@ -15,7 +15,7 @@ FILES := blocksort huffman crctable randtable  \
 
 #MM- linklibs: linklibs-bz2-nostdio
 
-USER_CFLAGS := -DBZ_NO_STDIO -DAROS_BZ2_STATICLIB
+USER_CFLAGS := -DBZ_NO_STDIO
 USER_CFLAGS += $(UNUSED_BUT_SET_VARIABLE_CFLAGS)
 
 %build_linklib mmake=linklibs-bz2-nostdio libname=bz2_nostdio \
diff --git a/workbench/libs/expat/lib/expat.h b/workbench/libs/expat/lib/expat.h
index be574da174..9a21680be4 100644
--- a/workbench/libs/expat/lib/expat.h
+++ b/workbench/libs/expat/lib/expat.h
@@ -1040,10 +1040,6 @@ XML_GetFeatureList(void);
 #define XML_MINOR_VERSION 1
 #define XML_MICRO_VERSION 0
 
-#if defined(__AROS__) && !defined(AROS_EXPAT_STATICLIB)
-#   include <proto/expat_au.h>
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/workbench/libs/z/mmakefile.src b/workbench/libs/z/mmakefile.src
index ca70217151..504354af1d 100644
--- a/workbench/libs/z/mmakefile.src
+++ b/workbench/libs/z/mmakefile.src
@@ -21,7 +21,7 @@ USER_CFLAGS := -DSTDC -DAMIGA -DZ_HAVE_UNISTD_H
 
 #MM- linklibs: linklibs-z-static
 
-USER_CFLAGS := -DSTDC -DAMIGA -DZ_HAVE_UNISTD_H -DAROS_Z_STATICLIB
+USER_CFLAGS := -DSTDC -DAMIGA -DZ_HAVE_UNISTD_H
 
 %build_linklib mmake=linklibs-z-static libname=z.static files="$(FILES)"
 
diff --git a/workbench/libs/z/zlib.h b/workbench/libs/z/zlib.h
index 82b8fd35fd..3edf3acdb5 100644
--- a/workbench/libs/z/zlib.h
+++ b/workbench/libs/z/zlib.h
@@ -1737,10 +1737,6 @@ ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
 
-#if defined(__AROS__) && !defined(AROS_Z_STATICLIB)
-#   include <proto/z_au.h>
-#endif
-
 #ifdef __cplusplus
 }
 #endif
-- 
2.11.4.GIT