Make configure understand CPPFLAGS=, CFLAGS=, LDFLAGS=...

diff --git a/CHANGES b/CHANGES
index 3fad0c541bd3e231eb75518656c50aef6ca9fd8d..47eead29167a5670fbf94a677b6c64f37e5f5e1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.229 2003/05/07 14:45:18 stelian Exp $
+$Id: CHANGES,v 1.230 2003/05/08 21:11:33 stelian Exp $

 
 Changes between versions 0.4b34 and 0.4b35 (released ??????????????)
 ====================================================================
 
 Changes between versions 0.4b34 and 0.4b35 (released ??????????????)
 ====================================================================


@@ -8,6 +8,10 @@ Changes between versions 0.4b34 and 0.4b35 (released ??????????????)
        Thanks to Antonios Christofides <A.Christofides@itia.ntua.gr>
        for the patch.
 
        Thanks to Antonios Christofides <A.Christofides@itia.ntua.gr>
        for the patch.
 

+2.     Fixed configure to correctly understand CPPFLAGS, CFLAGS,
+       LDFLAGS environment variables. Thanks to Arcady Genkin
+       <antipode@users.sourceforge.net> for reporting the bug.
+

 Changes between versions 0.4b33 and 0.4b34 (released April 18, 2003)
 ====================================================================
 
 Changes between versions 0.4b33 and 0.4b34 (released April 18, 2003)
 ====================================================================
 

diff --git a/THANKS b/THANKS
index a414702ad3b877e9a9e978d6742f7462df92f828..cd3a3ad142492df0f789886dbcc07df9df19b917 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.81 2003/05/07 14:45:18 stelian Exp $
+$Id: THANKS,v 1.82 2003/05/08 21:11:33 stelian Exp $

 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.


@@ -47,6 +47,7 @@ Bernhard Erdmann      bernhard.erdmann@gmx.de
 Jason Fearon           jasonf@netrider.org.au
 Jeremy Fitzhardinge    jeremy@goop.org
 Eirik Fuller           eirik@netcom.com
 Jason Fearon           jasonf@netrider.org.au
 Jeremy Fitzhardinge    jeremy@goop.org
 Eirik Fuller           eirik@netcom.com

+Arcady Genkin          antipode@users.sourceforge.net

 Uwe Gohlke             uwe@ugsoft.de
 Ian Gordon             iangordon@users.sourceforge.net
 Ted Grzesik            tedgyz@roostme.com
 Uwe Gohlke             uwe@ugsoft.de
 Ian Gordon             iangordon@users.sourceforge.net
 Ted Grzesik            tedgyz@roostme.com

diff --git a/common/Makefile.in b/common/Makefile.in
index b8a5d3271ad876ea69c96e64025ae5302f3e8b6a..80ea04d401c20e358a7cc36c85d5fa1aa4a6fff1 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.4 2003/01/24 11:01:48 stelian Exp $
+# $Id: Makefile.in,v 1.5 2003/05/08 21:11:39 stelian Exp $

 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@


@@ -7,10 +7,14 @@ top_builddir= ..
 @MCONFIG@
 
 INC=           -I$(top_srcdir)/dump
 @MCONFIG@
 
 INC=           -I$(top_srcdir)/dump

-CFLAGS=                @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
+ALL_CFLAGS=    @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @DUMPDEBUG@
+ALL_LDFLAGS=   @LDFLAGS@ @LDOPTS@ @STATIC@

 SRCS=          dumprmt.c
 OBJS=          dumprmt.o
 
 SRCS=          dumprmt.c
 OBJS=          dumprmt.o
 

+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@
+

 all::          $(OBJS)
 
 install::
 all::          $(OBJS)
 
 install::

diff --git a/compat/lib/Makefile.in b/compat/lib/Makefile.in
index ee6e26b9b267bb10e2fceae32fe1e95df50d0bb5..cc909690775d6ec3940022cd4fe187cac675c1ad 100644 (file)
--- a/compat/lib/Makefile.in
+++ b/compat/lib/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.9 2003/03/31 09:42:57 stelian Exp $
+# $Id: Makefile.in,v 1.10 2003/05/08 21:11:39 stelian Exp $

 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@


@@ -7,11 +7,14 @@ top_builddir= ../..
 @MCONFIG@
 
 INC=           -I$(top_srcdir)/compat/include
 @MCONFIG@
 
 INC=           -I$(top_srcdir)/compat/include

-CFLAGS=                @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
+ALL_CFLAGS=    @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)

 SRCS=          compaterr.c compatglob.c bylabel.c system.c rmtflags.c minilzo.c
 OBJS=          compaterr.o compatglob.o bylabel.o system.o rmtflags.o minilzo.o
 LIB=           libcompat.a
 
 SRCS=          compaterr.c compatglob.c bylabel.c system.c rmtflags.c minilzo.c
 OBJS=          compaterr.o compatglob.o bylabel.o system.o rmtflags.o minilzo.o
 LIB=           libcompat.a
 

+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@
+

 all::          $(LIB)
 
 $(LIB):                $(OBJS)
 all::          $(LIB)
 
 $(LIB):                $(OBJS)

diff --git a/dump/Makefile.in b/dump/Makefile.in
index e90dc28c9c53b60893b86f9c31aabb7fced5060d..a8a2b158de6902fefed996d893207489e0422e0b 100644 (file)
--- a/dump/Makefile.in
+++ b/dump/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.10 2003/01/24 11:01:49 stelian Exp $
+# $Id: Makefile.in,v 1.11 2003/05/08 21:11:39 stelian Exp $

 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@


@@ -6,8 +6,9 @@ top_builddir=   ..
 
 @MCONFIG@
 
 
 @MCONFIG@
 

-CFLAGS=                @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @DUMPDEBUG@
-LDFLAGS=       @LDOPTS@ @STATIC@
+INC=           -I$(top_srcdir)/dump
+ALL_CFLAGS=    @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @DUMPDEBUG@
+ALL_LDFLAGS=   @LDFLAGS@ @LDOPTS@ @STATIC@

 LIBS=          $(GLIBS) @ZLIB@ @BZLIB@
 DEPLIBS=       ../compat/lib/libcompat.a
 
 LIBS=          $(GLIBS) @ZLIB@ @BZLIB@
 DEPLIBS=       ../compat/lib/libcompat.a
 


@@ -20,10 +21,13 @@ OBJS=               itime.o main.o optr.o tape.o traverse.o unctime.o \
 MAN8=          dump.8
 RMAN8=         rdump.8
 
 MAN8=          dump.8
 RMAN8=         rdump.8
 

+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@
+

 all::          $(PROG) $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)
 all::          $(PROG) $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)

-       $(LD) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+       $(LD) $(ALL_LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)

 
 $(MAN8):       dump.8.in
        sed -e "s|__DUMPDATES__|$(DUMPDATESPATH)|g" \
 
 $(MAN8):       dump.8.in
        sed -e "s|__DUMPDATES__|$(DUMPDATESPATH)|g" \

diff --git a/restore/Makefile.in b/restore/Makefile.in
index 344af88c1932448ad9e1b1c650debf89c781d67b..cdc2004cf1076daf784e0e939990ac04781cdacb 100644 (file)
--- a/restore/Makefile.in
+++ b/restore/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.11 2003/01/24 11:01:49 stelian Exp $
+# $Id: Makefile.in,v 1.12 2003/05/08 21:11:39 stelian Exp $

 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@


@@ -6,8 +6,9 @@ top_builddir=   ..
 
 @MCONFIG@
 
 
 @MCONFIG@
 

-CFLAGS=                @CCOPTS@ -pipe $(OPT) $(DEFS) $(GINC) $(INC) @RESTOREDEBUG@
-LDFLAGS=       @LDOPTS@ @STATIC@
+INC=           -I$(top_srcdir)/restore
+ALL_CFLAGS=    @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @RESTOREDEBUG@
+ALL_LDFLAGS=   @LDFLAGS@ @LDOPTS@ @STATIC@

 LIBS=          $(GLIBS) -le2p @READLINE@ @ZLIB@ @BZLIB@
 DEPLIBS=       ../compat/lib/libcompat.a
 
 LIBS=          $(GLIBS) -le2p @READLINE@ @ZLIB@ @BZLIB@
 DEPLIBS=       ../compat/lib/libcompat.a
 


@@ -21,10 +22,13 @@ OBJS=               dirs.o interactive.o main.o restore.o symtab.o tape.o \
 MAN8=          restore.8
 RMAN8=         rrestore.8
 
 MAN8=          restore.8
 RMAN8=         rrestore.8
 

+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@
+

 all::          $(PROG) $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)
 all::          $(PROG) $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)

-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+       $(CC) $(ALL_LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)

 
 $(MAN8):       restore.8.in
        sed -e "s|__DATE__|$(DATE)|g" \
 
 $(MAN8):       restore.8.in
        sed -e "s|__DATE__|$(DATE)|g" \

diff --git a/rmt/Makefile.in b/rmt/Makefile.in
index a955a6215d29216249616016879c7a2ffc64340e..f64f5fa49a53194809a91738bd6ad946c6872988 100644 (file)
--- a/rmt/Makefile.in
+++ b/rmt/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.9 2003/04/08 19:52:36 stelian Exp $
+# $Id: Makefile.in,v 1.10 2003/05/08 21:11:39 stelian Exp $

 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@
 
 top_srcdir=    @top_srcdir@
 srcdir=                @srcdir@


@@ -6,8 +6,8 @@ top_builddir=   ..
 
 @MCONFIG@
 
 
 @MCONFIG@
 

-CFLAGS=                @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
-LDFLAGS=       @LDOPTS@ @STATIC@
+ALL_CFLAGS=    @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
+ALL_LDFLAGS=   @LDFLAGS@ @LDOPTS@ @STATIC@

 LIBS=          $(GLIBS)
 DEPLIBS=       ../compat/lib/libcompat.a
 
 LIBS=          $(GLIBS)
 DEPLIBS=       ../compat/lib/libcompat.a
 


@@ -16,15 +16,19 @@ SRCS=               rmt.c
 OBJS=          rmt.o
 MAN8=          rmt.8
 
 OBJS=          rmt.o
 MAN8=          rmt.8
 

+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@
+

 all::          $(PROG) @ERMT@ $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)
 all::          $(PROG) @ERMT@ $(MAN8)
 
 $(PROG):       $(OBJS) $(DEPLIBS)

-       $(LD) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+       $(LD) $(ALL_LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)

 
 ermt:  ermt.o cipher.o $(DEPLIBS)
 
 ermt:  ermt.o cipher.o $(DEPLIBS)

-       $(LD) $(CFLAGS) $(LDFLAGS) -o ermt ermt.o cipher.o $(LIBS) @CRYPTO@
+       $(LD) $(ALL_LDFLAGS) -o ermt ermt.o cipher.o $(LIBS) @CRYPTO@
+

 ermt.o: rmt.c
 ermt.o: rmt.c

-       $(CC) -c $(CFLAGS) -DERMT -o ermt.o rmt.c
+       $(CC) -c $(ALL_CFLAGS) -DERMT -o ermt.o rmt.c

 
 $(MAN8):               rmt.8.in
        sed -e "s|__DATE__|$(DATE)|g" \
 
 $(MAN8):               rmt.8.in
        sed -e "s|__DATE__|$(DATE)|g" \