From c8a7830b9ae9050a9a06a8b8e51487ae40f5f6c6 Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 2 Mar 2001 22:48:39 +0000 Subject: [PATCH] added test for hpux. if matched, compile zlib with -fpic instead of -fPIC git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@18 a5681a0c-68f1-0310-ab6d-d61299d08faa --- configure.in | 4 +++- libraries/zlib-1.1.3/Makefile.am | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 3466c45..d8a27e7 100644 --- a/configure.in +++ b/configure.in @@ -148,12 +148,14 @@ fi dnl add pic flag in any case this makes sure all our code is relocatable CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'` +ZLIB_CFLAGS=$CFLAGS dnl it seems that hpux chockes on -fPIC for some reason case $target_os in *hpux*) - CLFAGS=`echo $CFLAGS|sed -e 's/-fPIC/-fpic/g'` + ZLIB_CFLAGS=`echo $CFLAGS|sed -e 's/-fPIC/-fpic/g'` ;; esac +AC_SUBST(ZLIB_CFLAGS) dnl Checks for library functions. AC_FUNC_STRFTIME diff --git a/libraries/zlib-1.1.3/Makefile.am b/libraries/zlib-1.1.3/Makefile.am index 457db90..6eda278 100644 --- a/libraries/zlib-1.1.3/Makefile.am +++ b/libraries/zlib-1.1.3/Makefile.am @@ -8,6 +8,8 @@ EXTRA_DIST= ChangeLog FAQ INDEX README README.rrdtool algorithm.txt zlib.dsp zlib.dsw zlib.3 +CFLAGS = $(ZLIB_CFLAGS) + noinst_LTLIBRARIES = librrd_z.la librrd_z_la_SOURCES = \ -- 2.11.0