bwm-tools-devel Mailing List for Bandwidth Management Tools (Page 4)
Brought to you by:
nkukard
Menu
▾
▴
bwm-tools-devel — Developer Mailing List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(52) |
Feb
|
Mar
|
Apr
(6) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(3) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Dr. N. K. <sv...@li...> - 2005-01-01 07:31:02
|
Author: nkukard
Date: 2005-01-01 08:54:26 +0200 (Sat, 01 Jan 2005)
New Revision: 15
Modified:
trunk/include/flow.h
trunk/lib/flow.c
trunk/lib/ipq.c
Log:
* Removed all compiler warnings that seem to have crept in
Modified: trunk/include/flow.h
===================================================================
--- trunk/include/flow.h 2004-12-29 21:11:51 UTC (rev 14)
+++ trunk/include/flow.h 2005-01-01 06:54:26 UTC (rev 15)
@@ -206,7 +206,7 @@
// Check if we will exceed flow queuing limits
-static inline will_exceed_flow_queue(struct flow_t *flow, unsigned int pktSize)
+static inline int will_exceed_flow_queue(struct flow_t *flow, unsigned int pktSize)
{
return ((flow->curQueueLen >= flow->maxQueueLen && flow->maxQueueLen != 0) ||
(flow->curQueueSize + pktSize >= flow->maxQueueSize && flow->maxQueueSize != 0));
Modified: trunk/lib/flow.c
===================================================================
--- trunk/lib/flow.c 2004-12-29 21:11:51 UTC (rev 14)
+++ trunk/lib/flow.c 2005-01-01 06:54:26 UTC (rev 15)
@@ -375,7 +375,6 @@
else
{
unsigned int accumCredit;
- unsigned int accumBurst;
// Add up accumulated time
@@ -509,9 +508,6 @@
*/
if (ok && bursted)
{
- double parentCur = 0, parentCurBurst = 0;
-
-
// Calculate parent credits
calculate_flow_credit(flow->parent,PKT_SIZE(packet));
Modified: trunk/lib/ipq.c
===================================================================
--- trunk/lib/ipq.c 2004-12-29 21:11:51 UTC (rev 14)
+++ trunk/lib/ipq.c 2005-01-01 06:54:26 UTC (rev 15)
@@ -76,7 +76,7 @@
// Check if we will exceed our queue
-static inline will_exceed_pkt_queue(struct pktQueue_t *pktQueue, unsigned int pktSize)
+static inline int will_exceed_pkt_queue(struct pktQueue_t *pktQueue, unsigned int pktSize)
{
return ((pktQueue->curLen >= pktQueue->maxLen && pktQueue->maxLen != 0) ||
(pktQueue->curSize + pktSize >= pktQueue->maxSize && pktQueue->maxSize != 0));
@@ -162,8 +162,9 @@
// Process a ICMP packet
if (ip_packet->protocol == IPPROTO_ICMP)
{
+/*
struct icmphdr *icmph = (struct icmphdr *) (packet->payload->payload + (ip_packet->ihl * 4));
-/*
+
fprintf(stderr,"something: icmp = %i, type = %i\n", icmph->code, icmph->type);
*/
bandNum = 5;
|
|
From: <bwm...@li...> - 2004-12-29 21:12:07
|
Author: nkukard
Date: 2004-12-29 23:11:51 +0200 (Wed, 29 Dec 2004)
New Revision: 14
Modified:
trunk/bwm_monitor/display.c
trunk/configure
trunk/configure.ac
Log:
* Small change to syntax in display.c
* Added a little more info on rejected librrd library, if one
Modified: trunk/bwm_monitor/display.c
===================================================================
--- trunk/bwm_monitor/display.c 2004-12-29 17:03:34 UTC (rev 13)
+++ trunk/bwm_monitor/display.c 2004-12-29 21:11:51 UTC (rev 14)
@@ -33,7 +33,7 @@
// Function to title a window with text
void windowTitle(WINDOW *win, int color1, int color2, int y, int x, char *str)
{
- int len;
+ int len;
len = strlen(str);
mvwaddch(win, y, x, ACS_RTEE);
Modified: trunk/configure
===================================================================
--- trunk/configure 2004-12-29 17:03:34 UTC (rev 13)
+++ trunk/configure 2004-12-29 21:11:51 UTC (rev 14)
@@ -19626,7 +19626,12 @@
if test x"$have_librrd" = x
then
- echo "Error: Working librrd required"
+ echo
+ echo "* You need the development libraries and headers"
+ echo "* for rrdtool. Normally you can download a"
+ echo "* package called rrdtool-devel for your"
+ echo "* distribution, install it and everything should"
+ echo "* be fine"
exit 1
fi
RRDTOOL_LIBS="-lm"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2004-12-29 17:03:34 UTC (rev 13)
+++ trunk/configure.ac 2004-12-29 21:11:51 UTC (rev 14)
@@ -48,7 +48,12 @@
AC_CHECK_LIB([rrd], [rrd_update],have_librrd=yes,,"-lm")
if test x"$have_librrd" = x
then
- echo "Error: Working librrd required"
+ echo
+ echo "* You need the development libraries and headers"
+ echo "* for rrdtool. Normally you can download a"
+ echo "* package called rrdtool-devel for your"
+ echo "* distribution, install it and everything should"
+ echo "* be fine"
exit 1
fi
RRDTOOL_LIBS="-lm"
|
|
From: <bwm...@li...> - 2004-12-29 17:03:54
|
Author: nkukard
Date: 2004-12-29 19:03:34 +0200 (Wed, 29 Dec 2004)
New Revision: 13
Modified:
trunk/bwm_firewall/bwm_firewall.c
trunk/bwm_graph/bwm_graph.c
Log:
* Small copyright date changes
Modified: trunk/bwm_firewall/bwm_firewall.c
===================================================================
--- trunk/bwm_firewall/bwm_firewall.c 2004-12-29 10:39:07 UTC (rev 12)
+++ trunk/bwm_firewall/bwm_firewall.c 2004-12-29 17:03:34 UTC (rev 13)
@@ -115,7 +115,7 @@
};
- printf("BWM Firewall v%s - Copyright (c) 2003 Linux Based Systems Design\n\n",PACKAGE_VERSION);
+ printf("BWM Firewall v%s - Copyright (c) 2003-2004 Linux Based Systems Design\n\n",PACKAGE_VERSION);
// Check if we have no args
if (argc == 1)
Modified: trunk/bwm_graph/bwm_graph.c
===================================================================
--- trunk/bwm_graph/bwm_graph.c 2004-12-29 10:39:07 UTC (rev 12)
+++ trunk/bwm_graph/bwm_graph.c 2004-12-29 17:03:34 UTC (rev 13)
@@ -92,7 +92,7 @@
options = (struct graphOptions_t*) malloc0(sizeof(struct graphOptions_t));
// FIXME - error check
- printf("BWM Graph v%s - Copyright (c) 2003 Linux Based Systems Design\n\n",PACKAGE_VERSION);
+ printf("BWM Graph v%s - Copyright (c) 2003-2004 Linux Based Systems Design\n\n",PACKAGE_VERSION);
// Print out help
if (argc == 1)
|
|
From: <bwm...@li...> - 2004-12-29 10:39:31
|
Author: nkukard
Date: 2004-12-29 12:39:07 +0200 (Wed, 29 Dec 2004)
New Revision: 12
Modified:
trunk/lib/flow.c
trunk/lib/ipq.c
Log:
* Removed a whole bunch of debugging printf's
Modified: trunk/lib/flow.c
===================================================================
--- trunk/lib/flow.c 2004-12-29 10:33:18 UTC (rev 11)
+++ trunk/lib/flow.c 2004-12-29 10:39:07 UTC (rev 12)
@@ -179,19 +179,19 @@
pktQueue->packets = NULL;
}
- printf("Flow added...\n");
- printf(" flowName - %s\n",flowName);
- printf(" parent - %p\n",parentFlow);
- printf(" nfmark - %li\n",nfmark);
- printf(" statsLen - %li\n",flow->statsLen);
- printf(" maxQueueSize - %li\n",flow->maxQueueSize);
- printf(" maxQueueLen - %li\n",flow->maxQueueLen);
- printf(" maxRate - %li\n",flow->maxRate);
- printf(" usCredit - %.6f\n",flow->usCredit);
- printf(" curCredit - %u\n",flow->curCredit);
- printf(" usBurstCredit - %.6f\n",flow->usBurstCredit);
- printf(" curBurstCredit - %u\n",flow->curBurstCredit);
- printf(" burstRate - %li\n",flow->burstRate);
+// printf("Flow added...\n");
+// printf(" flowName - %s\n",flowName);
+// printf(" parent - %p\n",parentFlow);
+// printf(" nfmark - %li\n",nfmark);
+// printf(" statsLen - %li\n",flow->statsLen);
+// printf(" maxQueueSize - %li\n",flow->maxQueueSize);
+// printf(" maxQueueLen - %li\n",flow->maxQueueLen);
+// printf(" maxRate - %li\n",flow->maxRate);
+// printf(" usCredit - %.6f\n",flow->usCredit);
+// printf(" curCredit - %u\n",flow->curCredit);
+// printf(" usBurstCredit - %.6f\n",flow->usBurstCredit);
+// printf(" curBurstCredit - %u\n",flow->curBurstCredit);
+// printf(" burstRate - %li\n",flow->burstRate);
// printf("Queue Stuff:\n");
// printf(" min_th - %li\n",flow->min_th);
// printf(" max_th - %li\n",flow->max_th);
@@ -485,24 +485,13 @@
/* Check if we will exceed our burst credit */
if ((i = burst_credit_will_exceed(flow,PKT_SIZE(packet))))
- {
ok = 0;
- fprintf(stderr,"%s(%i): res = %i, Will exceed for %s (%i:%i:%i:%i)\n",__FILE__,__LINE__,
- i,flow->flowName,
- flow->maxRate,flow->curCredit,flow->burstRate,flow->curBurstCredit);
- }
else
- {
// Guess we didn't, we bursted
bursted = 1;
- fprintf(stderr,"%s(%i): res = %i, Bursted to parent %s\n",__FILE__,__LINE__,i,flow->flowName);
- }
}
else
- {
- fprintf(stderr,"%s(%i): Will exceed for %s\n",__FILE__,__LINE__,flow->flowName);
ok = 0;
- }
}
// If we have a parent, if we do... do a few tests
@@ -510,10 +499,7 @@
{
// Check if we havn't exceeded our parent queues
if (will_exceed_flow_queue(flow->parent,PKT_SIZE(packet)))
- {
ok = 0;
- fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
- }
/*
* if (....) - if we here because of bursting, check if we have a
@@ -541,20 +527,14 @@
{
if (flow->parent_th > 0 && flow->parent_th < (flow->parent->curThroughput /
(double) flow->parent->burstRate) * 100.0)
- {
ok = 0;
- fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
- }
}
// If not, against the maxRate
else if (flow->parent->maxRate > 0)
{
if (flow->parent_th > 0 && flow->parent_th < (flow->parent->curThroughput /
(double) flow->parent->maxRate) * 100.0)
- {
ok = 0;
- fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
- }
}
}
}
@@ -563,6 +543,9 @@
// If packet is still ok to pass through, do our stuff
if (ok)
{
+ struct timeval curTime;
+
+
g_mutex_lock(flow->lock);
flow->running.pktCount++;
@@ -578,36 +561,26 @@
if (bursted)
flow->running.pktBursted++;
- // Update our throughput
- {
- struct timeval curTime;
-
- // Grab exact time now
- gettimeofday(&curTime,NULL);
+ // Grab exact time now
+ gettimeofday(&curTime,NULL);
-
- // Add up accumulated time
- if (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec > 0)
- flow->curThroughputAge += (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec) * 1000000;
- else
- flow->curThroughputAge += curTime.tv_usec - flow->lastThroughputUpdate.tv_usec;
+ // Add up accumulated time
+ if (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec > 0)
+ flow->curThroughputAge += (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec) * 1000000;
+ else
+ flow->curThroughputAge += curTime.tv_usec - flow->lastThroughputUpdate.tv_usec;
- // 2 seconds
- if (flow->curThroughputAge >= 2000000)
- {
- flow->curThroughputAge -= 2000000;
- flow->curThroughput = flow->curThroughputAge / 1000000.0 * flow->curThroughput;
- }
+ // 2 seconds
+ if (flow->curThroughputAge >= 2000000)
+ {
+ flow->curThroughputAge -= 2000000;
+ flow->curThroughput = flow->curThroughputAge / 1000000.0 * flow->curThroughput;
+ }
- fprintf(stderr,"%s: throughput: %i/%f\n",flow->flowName,flow->curThroughputAge,flow->curThroughput);
-
- // Set this as the last time we updated our throughput
- gettimeofday(&flow->lastThroughputUpdate,NULL);
+ // Set this as the last time we updated our throughput
+ gettimeofday(&flow->lastThroughputUpdate,NULL);
+
- }
-
- fprintf(stderr,"%s: Current throughput = %f\n",flow->flowName,flow->curThroughput);
-
g_mutex_unlock(flow->lock);
// Time to update our groups
@@ -640,7 +613,6 @@
packets = g_list_remove(packets,packet);
// Save the size
i = PKT_SIZE(packet);
- // FIXME - UPDATE GROUPS
// "Free" the packet
g_mutex_lock(runnerData->pmem.lock);
runnerData->pmem.freeList = g_list_append(runnerData->pmem.freeList,packet);
@@ -656,7 +628,6 @@
struct pktQueue_t *nextPktQueue = flow->pktQueues[pktQueue->prio];
- fprintf(stderr,"Overflowing to %s...\n",flow->flowName);
// We can do this before locking
queuedLen++;
queuedSize += PKT_SIZE(packet);
@@ -716,9 +687,6 @@
g_mutex_unlock(pktQueue->lock);
- // Quickly and update everything in between
-//FIXME!!!!! updateGroups(runnerData,flow,1,i,0,0);
-
return(acceptLen);
}
@@ -742,7 +710,6 @@
// Check if we found a flow with a queue
pktsProcessed += processPktQueue(aRunnerData,pktQueue);
-// printf("%i packets processed\n",pktsProcessed);
}
Modified: trunk/lib/ipq.c
===================================================================
--- trunk/lib/ipq.c 2004-12-29 10:33:18 UTC (rev 11)
+++ trunk/lib/ipq.c 2004-12-29 10:39:07 UTC (rev 12)
@@ -197,10 +197,7 @@
// Check first of all if we fucked over our one of our queue limits
if (will_exceed_pkt_queue(foundQueue,PKT_SIZE(packet)) ||
will_exceed_flow_queue(foundQueue->parentFlow,PKT_SIZE(packet)))
- {
drop = 1;
- fprintf(stderr,"%s: Will exceed @ %i\n",foundQueue->parentFlow->flowName,__LINE__);
- }
#if 0
@@ -225,8 +222,6 @@
// Check if we must pass the packet
if (!drop)
{
- fprintf(stderr,"%s: Queuing packet @ %i, queue size = %i, queue len = %i\n",foundQueue->parentFlow->flowName,__LINE__,
- foundQueue->curSize,foundQueue->curLen);
// Lock, queue... adjust stats
foundQueue->packets = g_list_append(foundQueue->packets,packet);
foundQueue->curSize += PKT_SIZE(packet);
|
|
From: <bwm...@li...> - 2004-12-29 10:33:39
|
Author: nkukard Date: 2004-12-29 12:33:18 +0200 (Wed, 29 Dec 2004) New Revision: 11 Modified: trunk/lib/flow.c Log: * Fixed bug in queue limits, -1 denotes NONE or NOT SPECIFIED, 0 denotes unlimited Modified: trunk/lib/flow.c =================================================================== --- trunk/lib/flow.c 2004-12-29 10:20:50 UTC (rev 10) +++ trunk/lib/flow.c 2004-12-29 10:33:18 UTC (rev 11) @@ -174,8 +174,8 @@ pktQueue->nfmark = -1; pktQueue->curSize = 0; pktQueue->curLen = 0; - pktQueue->maxSize = -1; - pktQueue->maxLen = -1; + pktQueue->maxSize = 0; + pktQueue->maxLen = 0; pktQueue->packets = NULL; } |
|
From: <bwm...@li...> - 2004-12-29 10:21:02
|
Author: nkukard
Date: 2004-12-29 12:20:50 +0200 (Wed, 29 Dec 2004)
New Revision: 10
Modified:
trunk/bwmd/bwmd.c
Log:
* Updated copyright version
* Added a check to find out if we were supplied invalid arguments
Modified: trunk/bwmd/bwmd.c
===================================================================
--- trunk/bwmd/bwmd.c 2004-12-28 15:22:33 UTC (rev 9)
+++ trunk/bwmd/bwmd.c 2004-12-29 10:20:50 UTC (rev 10)
@@ -92,7 +92,7 @@
};
- printf("BWM Daemon v%s - Copyright (c) 2003 Linux Based Systems Design\n\n",PACKAGE_VERSION);
+ printf("BWM Daemon v%s - Copyright (c) 2003-2004 Linux Based Systems Design\n\n",PACKAGE_VERSION);
// Loop with options
while (1)
@@ -116,7 +116,10 @@
case 'h':
// FIXME - version from CVS
printf("Usage: %s [-h|--help] [--config=<config_file>] [--foreground]\n",argv[0]);
- return(0);
+ return 0;
+ default:
+ printf("Usage: %s [-h|--help] [--config=<config_file>] [--foreground]\n",argv[0]);
+ return 1;
}
}
|
|
From: <bwm...@li...> - 2004-12-28 15:22:45
|
Author: nkukard Date: 2004-12-28 17:22:33 +0200 (Tue, 28 Dec 2004) New Revision: 9 Modified: trunk/bwm_monitor/bwm_monitor.c Log: * Fixed copyright notice in bwm_monitor to reflect proper years Modified: trunk/bwm_monitor/bwm_monitor.c =================================================================== --- trunk/bwm_monitor/bwm_monitor.c 2004-12-28 15:19:28 UTC (rev 8) +++ trunk/bwm_monitor/bwm_monitor.c 2004-12-28 15:22:33 UTC (rev 9) @@ -307,7 +307,7 @@ // Set our main screen wbkgdset(w_main, COLOR_PAIR(2) | ' '); fill_window(w_main); - windowTitle(w_main,3,2,0,2,"BWM Monitor v"PACKAGE_VERSION" - Copyright (c) 2003 Linux Based Systems Design"); + windowTitle(w_main,3,2,0,2,"BWM Monitor v"PACKAGE_VERSION" - Copyright (c) 2003-2004 Linux Based Systems Design"); refresh(); |
|
From: <bwm...@li...> - 2004-12-28 15:19:44
|
Author: nkukard
Date: 2004-12-28 17:19:28 +0200 (Tue, 28 Dec 2004)
New Revision: 8
Modified:
trunk/include/flow.h
trunk/lib/flow.c
trunk/lib/ipq.c
Log:
* Fixed a sly bug in the rate limiting code, which allowed us to burst over our limits
* Removed defined macros which deal with rate limiting, made these inline functions
* Removed threshold dropping when queue is nearly maxed, for this we should use proper algorithms like TBF or RED
Modified: trunk/include/flow.h
===================================================================
--- trunk/include/flow.h 2004-12-28 15:13:50 UTC (rev 7)
+++ trunk/include/flow.h 2004-12-28 15:19:28 UTC (rev 8)
@@ -42,54 +42,7 @@
// Packet id
#define PKT_ID(packet) packet->payload->packet_id
-// Will the QUEUE exceed with the packet?
-#define WILL_QUEUE_EXCEED(pktQueue,packet) \
- ((pktQueue->curLen >= pktQueue->maxLen && pktQueue->maxLen != 0) || \
- ((pktQueue->curSize + PKT_SIZE(packet)) >= pktQueue->maxSize && pktQueue->maxSize != 0))
-// Credit exceeded?
-#define WILL_CREDIT_EXCEED(flow,packet,maxCredit,burstCredit) \
- ((maxCredit - PKT_SIZE(packet) < 0 && flow->maxRate > 0 && flow->burstRate == -1) || \
- (burstCredit - PKT_SIZE(packet) < 0 && flow->burstRate > 0 && flow->maxRate != 0))
-
-// Will the FLOW queue exceed with the packet?
-#define WILL_FLOW_QUEUE_EXCEED(flow,packet) \
- ((flow->curQueueLen >= flow->maxQueueLen && flow->maxQueueLen != 0) || \
- ((flow->curQueueSize + PKT_SIZE(packet)) >= flow->maxQueueSize && flow->maxQueueSize != 0))
-
-// Threshold exceeded?
-#define TH_EXCEEDED(pktQueue,threshold) \
- (P_FLOW(pktQueue,curQueueLen) > P_FLOW(pktQueue,threshold) && P_FLOW(pktQueue,maxQueueLen) != 0)
-
-// Get new credit
-#define CALC_MAX_CREDIT(curTime,flow,creditVariable) \
- if (flow->maxRate > 0) \
- { \
- /* Calculate credit */ \
- if (curTime.tv_sec - flow->lastPacketTime.tv_sec > 0) \
- creditVariable = flow->maxRate; \
- else \
- creditVariable = flow->curMaxCredit + ((curTime.tv_usec - flow->lastPacketTime.tv_usec) * flow->usMaxCredit); \
- /* Check if we exceed */ \
- if (creditVariable > flow->maxRate) \
- creditVariable = flow->maxRate; \
- }
-
-/* Calculate how much we can burst */
-#define CALC_BURST_CREDIT(curTime,flow,creditVariable) \
- if (flow->burstRate > 0) \
- { \
- /* Calculate credit */ \
- if (curTime.tv_sec - flow->lastPacketTime.tv_sec > 0) \
- creditVariable = flow->burstRate; \
- else \
- creditVariable = flow->curBurstCredit + ((curTime.tv_usec - flow->lastPacketTime.tv_usec) * flow->usBurstCredit); \
- /* Check if we exceed */ \
- if (creditVariable > flow->burstRate) \
- creditVariable = flow->burstRate; \
- }
-
-
// Our packet statistic structure
struct pktStat_t
{
@@ -119,6 +72,7 @@
GList *packets;
};
+
// A flow
struct flow_t
{
@@ -146,8 +100,8 @@
struct pktQueue_t *pktQueues[NUM_PRIO_BANDS];
// Setup our thresholds
- long int min_th; // We start dropping packets here
- long int max_th; // We drop alot more here
+// long int min_th; // We start dropping packets here
+// long int max_th; // We drop alot more here
float parent_th; // Used to check the available percentage of parent bandwidth before we burst
// Counters, used for both shape & counter logging
@@ -155,11 +109,18 @@
struct pktStat_t counter; // This is the counter which is logged to file
GList *groups;
- float usMaxCredit; // Credits for maxRate per microsecond
- float curMaxCredit; // Current available credit for maxRate 0 <= curCredit <= maxRate
- float usBurstCredit;
- float curBurstCredit;
- struct timeval lastPacketTime; // Last "timeval" that we had a packet come in
+ double usCredit; // Credits for maxRate per microsecond
+ long int curCredit; // Current available credit for maxRate, if we burst we will be < 0
+
+ double usBurstCredit;
+ long int curBurstCredit; // Curent burstable credit available
+
+ float curThroughput; // Current throughput
+ unsigned int curThroughputAge; // How many microseconds since last throughput update
+ struct timeval lastThroughputUpdate; // Last time the throughput was updated
+
+ unsigned int accumMs; // Accumulated number of microseconds
+ struct timeval lastCreditCalc; // Last "timeval" that we calculated additional credit
struct pktStat_t running; // This is the running counter
int lastDumpTimestamp;
@@ -167,6 +128,7 @@
int counterRemaining;
};
+
// A group
struct group_t
{
@@ -194,9 +156,11 @@
GList *flowList;
};
+
// Get avg flow stats
struct pktStat_t getFlowTotalStats(struct pktStat_t *pktStats, long int pktStatsLen);
+
// Create a flow
struct flow_t* createFlow(
char *flowName,
@@ -210,6 +174,7 @@
float parent_th,
int reportTimeout);
+
// Create group
struct group_t *createGroup(
char *groupName,
@@ -217,6 +182,7 @@
int reportTimeout,
GList *flowList);
+
// Function to update all our flow groups
void updateGroups(
struct flow_t *flow,
@@ -224,7 +190,8 @@
int pktSize,
int pktDropped,
int pktBursted);
-
+
+
// Create a packet queue
struct pktQueue_t *createPktQueue(
long int prio,
@@ -236,5 +203,16 @@
void *flowRunner(void *data);
+
+
+// Check if we will exceed flow queuing limits
+static inline will_exceed_flow_queue(struct flow_t *flow, unsigned int pktSize)
+{
+ return ((flow->curQueueLen >= flow->maxQueueLen && flow->maxQueueLen != 0) ||
+ (flow->curQueueSize + pktSize >= flow->maxQueueSize && flow->maxQueueSize != 0));
+}
+
+
+
#endif
Modified: trunk/lib/flow.c
===================================================================
--- trunk/lib/flow.c 2004-12-28 15:13:50 UTC (rev 7)
+++ trunk/lib/flow.c 2004-12-28 15:19:28 UTC (rev 8)
@@ -70,6 +70,7 @@
flow->statsPos = 0;
flow->parent = parentFlow;
+
flow->maxQueueSize = maxQueueSize;
flow->maxQueueLen = maxQueueLen;
flow->maxRate = maxRate;
@@ -97,27 +98,32 @@
// Check if we can set our credit
if (flow->maxRate > 0)
{
- flow->usMaxCredit = flow->maxRate / 1000000.0; // For micro (millionths) of seconds silly
- flow->curMaxCredit = flow->maxRate;
+ flow->usCredit = flow->maxRate / 1000000.0; // For micro (millionths) of seconds silly
+ flow->curCredit = 0;
}
else
{
- flow->usMaxCredit = 0;
- flow->curMaxCredit = 0;
+ flow->usCredit = 0;
+ flow->curCredit = 0;
}
if (flow->burstRate > 0)
{
flow->usBurstCredit = flow->burstRate / 1000000.0;
- flow->curBurstCredit = flow->burstRate;
+ flow->curBurstCredit = 0;
}
else
{
flow->usBurstCredit = 0;
flow->curBurstCredit = 0;
}
- // Set last packet time to now
- gettimeofday(&flow->lastPacketTime,NULL);
+ // Setup throughput stuff...
+ gettimeofday(&flow->lastThroughputUpdate,NULL);
+ flow->curThroughputAge = 0;
+ flow->curThroughput = 0;
+ // Set last time we calculated credit and the rest...
+ flow->accumMs = 0;
+ gettimeofday(&flow->lastCreditCalc,NULL);
// Clear our running counters
flow->running.pktCount = 0;
flow->running.pktSize = 0;
@@ -154,8 +160,8 @@
}
// Calculate our thresholds
- flow->min_th = (flow->maxRate / 750);
- flow->max_th = (flow->maxRate / 750) * 4;
+ //flow->min_th = (flow->maxRate / 750);
+ //flow->max_th = (flow->maxRate / 750) * 4;
// Blank all queues
for (i = 0; i < NUM_PRIO_BANDS; i++)
@@ -168,29 +174,27 @@
pktQueue->nfmark = -1;
pktQueue->curSize = 0;
pktQueue->curLen = 0;
- pktQueue->maxSize = 0;
- pktQueue->maxLen = 0;
+ pktQueue->maxSize = -1;
+ pktQueue->maxLen = -1;
pktQueue->packets = NULL;
}
-/*
printf("Flow added...\n");
- printf(" flowName - %s\n",flowName);
- printf(" parent - %p\n",parentFlow);
- printf(" nfmark - %li\n",nfmark);
- printf(" statsLen - %li\n",flow->statsLen);
- printf(" maxQueueSize - %li\n",flow->maxQueueSize);
- printf(" maxQueueLen - %li\n",flow->maxQueueLen);
- printf(" maxRate - %li\n",flow->maxRate);
- printf(" usMaxCredit - %.6f\n",flow->usMaxCredit);
- printf(" curMaxCredit - %.6f\n",flow->curMaxCredit);
- printf(" usCredit - %.6f\n",flow->usBurstCredit);
- printf(" curCredit - %.6f\n",flow->curBurstCredit);
- printf(" burstRate - %li\n",flow->burstRate);
- printf("Queue Stuff:\n");
- printf(" min_th - %li\n",flow->min_th);
- printf(" max_th - %li\n",flow->max_th);
-*/
+ printf(" flowName - %s\n",flowName);
+ printf(" parent - %p\n",parentFlow);
+ printf(" nfmark - %li\n",nfmark);
+ printf(" statsLen - %li\n",flow->statsLen);
+ printf(" maxQueueSize - %li\n",flow->maxQueueSize);
+ printf(" maxQueueLen - %li\n",flow->maxQueueLen);
+ printf(" maxRate - %li\n",flow->maxRate);
+ printf(" usCredit - %.6f\n",flow->usCredit);
+ printf(" curCredit - %u\n",flow->curCredit);
+ printf(" usBurstCredit - %.6f\n",flow->usBurstCredit);
+ printf(" curBurstCredit - %u\n",flow->curBurstCredit);
+ printf(" burstRate - %li\n",flow->burstRate);
+// printf("Queue Stuff:\n");
+// printf(" min_th - %li\n",flow->min_th);
+// printf(" max_th - %li\n",flow->max_th);
return flow;
}
@@ -348,7 +352,81 @@
}
+/* Set current credit & burst credit */
+static inline void calculate_flow_credit(struct flow_t *flow, unsigned int pktSize)
+{
+ // Check if we limited by rate
+ if (flow->maxRate > 0)
+ {
+ struct timeval curTime;
+ // Grab exact time now
+ gettimeofday(&curTime,NULL);
+
+ // Calculate credit
+ if (curTime.tv_sec - flow->lastCreditCalc.tv_sec > 0)
+ {
+ flow->curCredit = pktSize;
+ // If we must keep track of burst credit, do the same
+ if (flow->burstRate > 0)
+ flow->curBurstCredit = pktSize;
+ gettimeofday(&flow->lastCreditCalc,NULL);
+ }
+ else
+ {
+ unsigned int accumCredit;
+ unsigned int accumBurst;
+
+
+ // Add up accumulated time
+ flow->accumMs = curTime.tv_usec - flow->lastCreditCalc.tv_usec;
+ // See if we have at lease 1 byte to add
+ if ((accumCredit = flow->accumMs * flow->usCredit) > 1)
+ {
+ // If so add it to max of maxRate
+ flow->curCredit += accumCredit;
+
+ // Add on burst credit, if we can
+ if (flow->burstRate > 0)
+ flow->curBurstCredit += (flow->accumMs * flow->usBurstCredit);
+
+ // Remove the number of microseconds we used
+ flow->accumMs -= (accumCredit / flow->usCredit);
+
+ // If we exceeded our max's, bring them back down a bit
+ if (flow->curCredit > flow->maxRate)
+ {
+ flow->curCredit = flow->maxRate;
+ flow->accumMs = 0;
+ }
+ if (flow->curBurstCredit > flow->burstRate)
+ flow->curBurstCredit = flow->burstRate;
+
+ // Set this as the last time we calculated credit
+ gettimeofday(&flow->lastCreditCalc,NULL);
+ }
+ }
+ }
+}
+
+
+// Check if we will exceed our credit
+static inline int credit_will_exceed(struct flow_t *flow, unsigned int pktSize)
+{
+ // Without the typecasts we always get a result of 0 .... *shrug*
+ return (flow->maxRate > 0 && (long int) flow->curCredit - (long int) pktSize < 0);
+}
+
+
+// Check if we will exceed our credit
+static inline int burst_credit_will_exceed(struct flow_t *flow, unsigned int pktSize)
+{
+ // If burstRate == 0, it means we can burst to infinity (limited by parent)
+ return (flow->burstRate != 0 && (long int) flow->curBurstCredit - (long int) pktSize < 0);
+}
+
+
+
// Function to process a flow queue, returns number of packets accepted
static int processPktQueue(struct runnerData_t *runnerData, struct pktQueue_t *pktQueue)
{
@@ -390,27 +468,52 @@
// Loop to root
while (flow && ok)
{
- struct timeval timeNow;
- float maxCredit = 0, burstCredit = 0;
-
-
- // Grab exact time now
- gettimeofday(&timeNow,NULL);
+ int bursted = 0;
+
// Set new credits
- CALC_MAX_CREDIT(timeNow,flow,maxCredit)
- CALC_BURST_CREDIT(timeNow,flow,burstCredit)
-
+ calculate_flow_credit(flow,PKT_SIZE(packet));
+
// Check if we have exceeded stuff we shouldn't
- if (WILL_CREDIT_EXCEED(flow,packet,maxCredit,burstCredit))
- ok = 0;
+ if ((i = credit_will_exceed(flow,PKT_SIZE(packet))))
+ {
+ // If we can burst.... see if exceed anything
+ if (flow->burstRate != -1)
+ {
+ int i;
+
+ /* Check if we will exceed our burst credit */
+ if ((i = burst_credit_will_exceed(flow,PKT_SIZE(packet))))
+ {
+ ok = 0;
+ fprintf(stderr,"%s(%i): res = %i, Will exceed for %s (%i:%i:%i:%i)\n",__FILE__,__LINE__,
+ i,flow->flowName,
+ flow->maxRate,flow->curCredit,flow->burstRate,flow->curBurstCredit);
+ }
+ else
+ {
+ // Guess we didn't, we bursted
+ bursted = 1;
+ fprintf(stderr,"%s(%i): res = %i, Bursted to parent %s\n",__FILE__,__LINE__,i,flow->flowName);
+ }
+ }
+ else
+ {
+ fprintf(stderr,"%s(%i): Will exceed for %s\n",__FILE__,__LINE__,flow->flowName);
+ ok = 0;
+ }
+ }
+
// If we have a parent, if we do... do a few tests
if (ok && flow->parent)
{
// Check if we havn't exceeded our parent queues
- if (WILL_FLOW_QUEUE_EXCEED(flow->parent,packet))
+ if (will_exceed_flow_queue(flow->parent,PKT_SIZE(packet)))
+ {
ok = 0;
+ fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
+ }
/*
* if (....) - if we here because of bursting, check if we have a
@@ -418,24 +521,45 @@
* 1. We cannot burst over our burst-threshold to the parent
* 2. We cannot burst to a parent who is bogged
*/
- // FIXME: Add a percentage of traffic in parent that is free so we can burst
- // FIXME: What about parent burst rates?
- if (ok && (maxCredit - PKT_SIZE(packet) < 0 && flow->maxRate > 0))
+ if (ok && bursted)
{
- float parentMax = 0, parentBurst = 0;
+ double parentCur = 0, parentCurBurst = 0;
// Calculate parent credits
- CALC_MAX_CREDIT(timeNow,flow->parent, parentMax)
- CALC_BURST_CREDIT(timeNow,flow->parent, parentBurst)
+ calculate_flow_credit(flow->parent,PKT_SIZE(packet));
// Check if we exceeded
- if (WILL_CREDIT_EXCEED(flow->parent,packet,parentMax,parentBurst) ||
- ((flow->parent_th > ((float) parentMax / (float) flow->parent->maxRate) * 100.0) &&
- flow->parent_th > 0))
- ok = 0;
+ if (credit_will_exceed(flow->parent,PKT_SIZE(packet)) &&
+ burst_credit_will_exceed(flow->parent,PKT_SIZE(packet)))
+ ok = 0;
+ else
+ {
+ // Parent threshold stuff, if we havn't exceeded the threshold we can burst
+ // First check if we can use the parent_th against the burst rate
+ if (flow->parent->burstRate > 0)
+ {
+ if (flow->parent_th > 0 && flow->parent_th < (flow->parent->curThroughput /
+ (double) flow->parent->burstRate) * 100.0)
+ {
+ ok = 0;
+ fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
+ }
+ }
+ // If not, against the maxRate
+ else if (flow->parent->maxRate > 0)
+ {
+ if (flow->parent_th > 0 && flow->parent_th < (flow->parent->curThroughput /
+ (double) flow->parent->maxRate) * 100.0)
+ {
+ ok = 0;
+ fprintf(stderr,"%s: Will exceed @ %i\n",flow->flowName,__LINE__);
+ }
+ }
+ }
}
}
+
// If packet is still ok to pass through, do our stuff
if (ok)
{
@@ -443,15 +567,47 @@
flow->running.pktCount++;
flow->running.pktSize += PKT_SIZE(packet);
- flow->curMaxCredit = maxCredit - PKT_SIZE(packet);
- flow->curBurstCredit = burstCredit - PKT_SIZE(packet);
+ flow->curCredit -= PKT_SIZE(packet);
+ flow->curThroughput += PKT_SIZE(packet);
+ // If we can burst ...
+ if (flow->burstRate > 0)
+ flow->curBurstCredit -= PKT_SIZE(packet);
+
// We bursted
- if (maxCredit < 0 && flow->maxRate != 0)
+ if (bursted)
flow->running.pktBursted++;
- // Last time we accepted
- gettimeofday(&flow->lastPacketTime,NULL);
+ // Update our throughput
+ {
+ struct timeval curTime;
+
+ // Grab exact time now
+ gettimeofday(&curTime,NULL);
+
+
+ // Add up accumulated time
+ if (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec > 0)
+ flow->curThroughputAge += (curTime.tv_sec - flow->lastThroughputUpdate.tv_sec) * 1000000;
+ else
+ flow->curThroughputAge += curTime.tv_usec - flow->lastThroughputUpdate.tv_usec;
+
+ // 2 seconds
+ if (flow->curThroughputAge >= 2000000)
+ {
+ flow->curThroughputAge -= 2000000;
+ flow->curThroughput = flow->curThroughputAge / 1000000.0 * flow->curThroughput;
+ }
+
+ fprintf(stderr,"%s: throughput: %i/%f\n",flow->flowName,flow->curThroughputAge,flow->curThroughput);
+
+ // Set this as the last time we updated our throughput
+ gettimeofday(&flow->lastThroughputUpdate,NULL);
+
+ }
+
+ fprintf(stderr,"%s: Current throughput = %f\n",flow->flowName,flow->curThroughput);
+
g_mutex_unlock(flow->lock);
// Time to update our groups
Modified: trunk/lib/ipq.c
===================================================================
--- trunk/lib/ipq.c 2004-12-28 15:13:50 UTC (rev 7)
+++ trunk/lib/ipq.c 2004-12-28 15:19:28 UTC (rev 8)
@@ -75,6 +75,14 @@
}
+// Check if we will exceed our queue
+static inline will_exceed_pkt_queue(struct pktQueue_t *pktQueue, unsigned int pktSize)
+{
+ return ((pktQueue->curLen >= pktQueue->maxLen && pktQueue->maxLen != 0) ||
+ (pktQueue->curSize + pktSize >= pktQueue->maxSize && pktQueue->maxSize != 0));
+}
+
+
// Queue a packet
static int queuePacket(struct runnerData_t *runnerData, long int nfmark, struct packet_t *packet)
{
@@ -187,8 +195,15 @@
g_mutex_lock(P_FLOW(foundQueue,lock));
// Check first of all if we fucked over our one of our queue limits
- if (WILL_QUEUE_EXCEED(foundQueue,packet) || WILL_FLOW_QUEUE_EXCEED(foundQueue->parentFlow,packet))
+ if (will_exceed_pkt_queue(foundQueue,PKT_SIZE(packet)) ||
+ will_exceed_flow_queue(foundQueue->parentFlow,PKT_SIZE(packet)))
+ {
drop = 1;
+ fprintf(stderr,"%s: Will exceed @ %i\n",foundQueue->parentFlow->flowName,__LINE__);
+ }
+
+
+#if 0
// Check second of all if we fucked our min threshold over
else if (TH_EXCEEDED(foundQueue,min_th))
{
@@ -205,11 +220,13 @@
drop = 1;
}
}
+#endif
-
// Check if we must pass the packet
if (!drop)
{
+ fprintf(stderr,"%s: Queuing packet @ %i, queue size = %i, queue len = %i\n",foundQueue->parentFlow->flowName,__LINE__,
+ foundQueue->curSize,foundQueue->curLen);
// Lock, queue... adjust stats
foundQueue->packets = g_list_append(foundQueue->packets,packet);
foundQueue->curSize += PKT_SIZE(packet);
|
|
From: <bwm...@li...> - 2004-12-28 15:17:21
|
Author: nkukard
Date: 2004-12-23 22:07:27 +0200 (Thu, 23 Dec 2004)
New Revision: 5
Modified:
trunk/Makefile.in
trunk/aclocal.m4
trunk/bwm_firewall/Makefile.am
trunk/bwm_firewall/Makefile.in
trunk/bwm_graph/Makefile.am
trunk/bwm_graph/Makefile.in
trunk/bwm_monitor/Makefile.am
trunk/bwm_monitor/Makefile.in
trunk/bwmd/Makefile.am
trunk/bwmd/Makefile.in
trunk/configure
trunk/configure.ac
trunk/lib/Makefile.am
trunk/lib/Makefile.in
trunk/lib/xmlConf.c
Log:
* Various gnu build utils fixes, we should be 100% complient now
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13,6 +13,24 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#
+# makefile.am - Makefile for BWM Tools
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -33,6 +51,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -46,7 +65,7 @@
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
SOURCES =
@@ -134,6 +153,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -148,6 +168,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -177,7 +199,10 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = lib bwm_firewall bwm_graph bwmd bwm_monitor
-EXTRA_DIST = include/autoclass.h include/common.h include/flow.h include/flowControl.h include/ipq.h include/libipq.h include/misc.h include/report.h include/xmlConf.h doc/Configuration doc/Install doc/example.xml
+EXTRA_DIST = include/autoclass.h include/common.h include/flow.h \
+ include/flowControl.h include/ipq.h include/libipq.h \
+ include/misc.h include/report.h include/xmlConf.h \
+ doc/Configuration doc/Install doc/example.xml
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -316,14 +341,16 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -333,9 +360,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -389,15 +418,17 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || mkdir "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="../$(top_distdir)" \
- distdir="../$(distdir)/$$subdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -408,15 +439,15 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-tarZ: distdir
- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
dist-shar: distdir
@@ -429,7 +460,7 @@
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -438,13 +469,13 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -467,7 +498,7 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkdir_p) "$$dc_destdir") \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
@@ -523,7 +554,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/aclocal.m4 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -18,7 +18,7 @@
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
dnl gthread is specified in MODULES, pass to pkg-config
dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
+AC_DEFUN([AM_PATH_GLIB_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
@@ -845,7 +845,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- testring="ABCD"
+ teststring="ABCD"
case $build_os in
msdosdjgpp*)
@@ -884,16 +884,16 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
- testring=$testring$testring
+ teststring=$teststring$teststring
done
- testring=
+ teststring=
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
@@ -1289,7 +1289,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext=".so"
+shrext_cmds=".so"
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -1402,7 +1402,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
+ shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
@@ -1467,7 +1467,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -1550,7 +1550,7 @@
need_version=no
case "$host_cpu" in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
@@ -1565,7 +1565,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
- shrext='.sl'
+ shrext_cmds='.sl'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -1576,7 +1576,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
- shrext='.sl'
+ shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -1647,8 +1647,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1730,7 +1730,7 @@
os2*)
libname_spec='$name'
- shrext=".dll"
+ shrext_cmds=".dll"
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
@@ -2321,14 +2321,14 @@
;;
cygwin*)
- # win32_libid is a shell function defined in ltmain.sh
+ # func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='win32_libid'
+ lt_cv_file_magic_cmd='func_win32_libid'
;;
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
@@ -2748,7 +2748,7 @@
fi
;;
-aix4*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -3196,7 +3196,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -3899,7 +3899,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+aix4* | aix5*)
test "$enable_shared" = yes && enable_static=no
;;
esac
@@ -4254,7 +4254,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -5362,7 +5362,7 @@
;;
linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
supports_anon_versioning=no
@@ -5562,7 +5562,7 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext=".dll"
+ shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -6133,208 +6133,15 @@
])
# Configure paths for LIBXML2
+# Mike Hommey 2004-06-19
+# use CPPFLAGS instead of CFLAGS
# Toshio Kuratomi 2001-04-21
# Adapted from:
# Configure paths for GLIB
# Owen Taylor 97-11-3
-dnl AM_PATH_XML([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XML],[
-AC_ARG_WITH(xml-prefix,
- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
- xml_config_prefix="$withval", xml_config_prefix="")
-AC_ARG_WITH(xml-exec-prefix,
- [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
- xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
-AC_ARG_ENABLE(xmltest,
- [ --disable-xmltest Do not try to compile and run a test LIBXML program],,
- enable_xmltest=yes)
-
- if test x$xml_config_exec_prefix != x ; then
- xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
- if test x${XML_CONFIG+set} != xset ; then
- XML_CONFIG=$xml_config_exec_prefix/bin/xml-config
- fi
- fi
- if test x$xml_config_prefix != x ; then
- xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
- if test x${XML_CONFIG+set} != xset ; then
- XML_CONFIG=$xml_config_prefix/bin/xml-config
- fi
- fi
-
- AC_PATH_PROG(XML_CONFIG, xml-config, no)
- min_xml_version=ifelse([$1], ,1.0.0,[$1])
- AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
- no_xml=""
- if test "$XML_CONFIG" = "no" ; then
- no_xml=yes
- else
- XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags`
- XML_LIBS=`$XML_CONFIG $xml_config_args --libs`
- xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_xmltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$XML_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxml is sufficiently new.
-dnl (Also sanity checks the results of xml-config to some extent)
-dnl
- rm -f conf.xmltest
- AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/tree.h>
-
-int
-main()
-{
- int xml_major_version, xml_minor_version, xml_micro_version;
- int major, minor, micro;
- char *tmp_version;
- int tmp_int_version;
-
- system("touch conf.xmltest");
-
- /* Capture xml-config output via autoconf/configure variables */
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = (char *)strdup("$min_xml_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string from xml-config\n", "$min_xml_version");
- exit(1);
- }
- free(tmp_version);
-
- /* Capture the version information from the header files */
- tmp_int_version = LIBXML_VERSION;
- xml_major_version=tmp_int_version / 10000;
- xml_minor_version=(tmp_int_version - xml_major_version * 10000) / 100;
- xml_micro_version=(tmp_int_version - xml_minor_version * 100 - xml_major_version * 10000);
-
- /* Compare xml-config output to the libxml headers */
- if ((xml_major_version != $xml_config_major_version) ||
- (xml_minor_version != $xml_config_minor_version)
-#if 0
- ||
-/* The last released version of libxml-1.x has an incorrect micro version in
- * the header file so neither the includes nor the library will match the
- * micro_version to the output of xml-config
- */
- (xml_micro_version != $xml_config_micro_version)
-#endif
- )
-
- {
- printf("*** libxml header files (version %d.%d.%d) do not match\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** xml-config (version %d.%d.%d)\n",
- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
- return 1;
- }
-/* Compare the headers to the library to make sure we match */
- /* Less than ideal -- doesn't provide us with return value feedback,
- * only exits if there's a serious mismatch between header and library.
- */
- LIBXML_TEST_VERSION;
-
- /* Test that the library is greater than our minimum version */
- if (($xml_config_major_version > major) ||
- (($xml_config_major_version == major) && ($xml_config_minor_version > minor)) ||
- (($xml_config_major_version == major) && ($xml_config_minor_version == minor) &&
- ($xml_config_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the xml-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of LIBXML, but you can also set the XML_CONFIG environment to point to the\n");
- printf("*** correct copy of xml-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- return 1;
-}
-],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- if test "x$no_xml" = x ; then
- AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$XML_CONFIG" = "no" ; then
- echo "*** The xml-config script installed by LIBXML could not be found"
- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the XML_CONFIG environment variable to the"
- echo "*** full path to xml-config."
- else
- if test -f conf.xmltest ; then
- :
- else
- echo "*** Could not run libxml test program, checking why..."
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$LIBS $XML_LIBS"
- AC_TRY_LINK([
-#include <libxml/tree.h>
-#include <stdio.h>
-], [ LIBXML_TEST_VERSION; return 0;],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
- echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
- echo "*** may want to edit the xml-config script: $XML_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- XML_CFLAGS=""
- XML_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(XML_CFLAGS)
- AC_SUBST(XML_LIBS)
- rm -f conf.xmltest
-])
-
-# Configure paths for LIBXML2
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor 97-11-3
-
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
+dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
dnl
AC_DEFUN([AM_PATH_XML2],[
AC_ARG_WITH(xml-prefix,
@@ -6367,7 +6174,7 @@
if test "$XML2_CONFIG" = "no" ; then
no_xml=yes
else
- XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
+ XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -6376,9 +6183,9 @@
xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xmltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XML_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$XML_LIBS $LIBS"
dnl
dnl Now check if the installed libxml is sufficiently new.
@@ -6461,7 +6268,7 @@
return 1;
}
],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
@@ -6481,7 +6288,7 @@
:
else
echo "*** Could not run libxml test program, checking why..."
- CFLAGS="$CFLAGS $XML_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$LIBS $XML_LIBS"
AC_TRY_LINK([
#include <libxml/xmlversion.h>
@@ -6500,16 +6307,16 @@
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
- XML_CFLAGS=""
+ XML_CPPFLAGS=""
XML_LIBS=""
ifelse([$3], , :, [$3])
fi
- AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_CPPFLAGS)
AC_SUBST(XML_LIBS)
rm -f conf.xmltest
])
@@ -6536,14 +6343,14 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.8.2])])
+ [AM_AUTOMAKE_VERSION([1.9.1])])
# AM_AUX_DIR_EXPAND
@@ -6611,7 +6418,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -6648,11 +6455,11 @@
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
fi])])
-# serial 6 -*- Autoconf -*-
+# serial 7 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -6739,7 +6546,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -6767,9 +6576,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
@@ -6815,7 +6629,8 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -6851,27 +6666,21 @@
else
continue
fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -6902,7 +6711,7 @@
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -6978,7 +6787,6 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -6987,7 +6795,9 @@
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
@@ -7220,21 +7030,37 @@
#
# Do not use -m 0755 and let people choose whatever they expect by
# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='mkdir -p -- .'
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
- for d in ./-p ./--;
+ for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
@@ -7394,3 +7220,111 @@
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
Modified: trunk/bwm_firewall/Makefile.am
===================================================================
--- trunk/bwm_firewall/Makefile.am 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_firewall/Makefile.am 2004-12-23 20:07:27 UTC (rev 5)
@@ -34,6 +34,6 @@
bin_PROGRAMS = bwm_firewall
bwm_firewall_SOURCES = bwm_firewall.c
bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
Modified: trunk/bwm_firewall/Makefile.in
===================================================================
--- trunk/bwm_firewall/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_firewall/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,6 +14,24 @@
@SET_MAKE@
+#
+# makefile.am - Makefile for BWM Firewall
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
SOURCES = $(bwm_firewall_SOURCES)
srcdir = @srcdir@
@@ -36,6 +54,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = bwm_firewall$(EXEEXT)
subdir = bwm_firewall
@@ -44,10 +63,10 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bwm_firewall_OBJECTS = bwm_firewall-bwm_firewall.$(OBJEXT)
@@ -56,14 +75,13 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bwm_firewall-bwm_firewall.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bwm_firewall_SOURCES)
DIST_SOURCES = $(bwm_firewall_SOURCES)
@@ -133,6 +151,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -147,6 +166,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -182,7 +203,7 @@
CONFIG_FILE = $(CONFIG_DIR)/firewall.xml
bwm_firewall_SOURCES = bwm_firewall.c
bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
all: all-am
@@ -219,15 +240,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -235,8 +256,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -261,50 +282,37 @@
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
bwm_firewall-bwm_firewall.o: bwm_firewall.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.o -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.o `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Po"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Po' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.o `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c
bwm_firewall-bwm_firewall.obj: bwm_firewall.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.obj -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.obj `if test -f 'bwm_firewall.c'; then $(CYGPATH_W) 'bwm_firewall.c'; else $(CYGPATH_W) '$(srcdir)/bwm_firewall.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Po"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Po' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.obj `if test -f 'bwm_firewall.c'; then $(CYGPATH_W) 'bwm_firewall.c'; else $(CYGPATH_W) '$(srcdir)/bwm_firewall.c'; fi`
-bwm_firewall-bwm_firewall.lo: bwm_firewall.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.lo -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.lo `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Plo"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Plo' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.lo `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c
-
mostlyclean-libtool:
-rm -f *.lo
@@ -335,9 +343,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -392,7 +402,9 @@
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
- $(mkdir_p) $(DESTDIR)$(bindir)
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -412,7 +424,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Modified: trunk/bwm_graph/Makefile.am
===================================================================
--- trunk/bwm_graph/Makefile.am 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_graph/Makefile.am 2004-12-23 20:07:27 UTC (rev 5)
@@ -29,7 +29,7 @@
bin_PROGRAMS = bwm_graph
bwm_graph_SOURCES = bwm_graph.c graph.c
bwm_graph_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_graph_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
+bwm_graph_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
bwm_graph_LDFLAGS = $(GLIB_LIBS) $(RRDTOOL_LIBS)
Modified: trunk/bwm_graph/Makefile.in
===================================================================
--- trunk/bwm_graph/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_graph/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,6 +14,24 @@
@SET_MAKE@
+#
+# makefile.am - Makefile for BWM Graph
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
SOURCES = $(bwm_graph_SOURCES)
srcdir = @srcdir@
@@ -36,6 +54,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = bwm_graph$(EXEEXT)
subdir = bwm_graph
@@ -44,10 +63,10 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bwm_graph_OBJECTS = bwm_graph-bwm_graph.$(OBJEXT) \
@@ -57,15 +76,13 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bwm_graph-bwm_graph.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/bwm_graph-graph.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bwm_graph_SOURCES)
DIST_SOURCES = $(bwm_graph_SOURCES)
@@ -135,6 +152,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -149,6 +167,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -181,7 +201,7 @@
LOG_DIR = @localstatedir@/bwm_tools
bwm_graph_SOURCES = bwm_graph.c graph.c
bwm_graph_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_graph_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
+bwm_graph_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
bwm_graph_LDFLAGS = $(GLIB_LIBS) $(RRDTOOL_LIBS)
all: all-am
@@ -218,15 +238,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -234,8 +254,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -261,74 +281,51 @@
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
bwm_graph-bwm_graph.o: bwm_graph.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.o -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.o `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Po"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_graph.c' object='bwm_graph-bwm_graph.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_graph-bwm_graph.Po' tmpdepfile='$(DEPDIR)/bwm_graph-bwm_graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -c -o bwm_graph-bwm_graph.o `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c
bwm_graph-bwm_graph.obj: bwm_graph.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.obj -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.obj `if test -f 'bwm_graph.c'; then $(CYGPATH_W) 'bwm_graph.c'; else $(CYGPATH_W) '$(srcdir)/bwm_graph.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Po"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_graph.c' object='bwm_graph-bwm_graph.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_graph-bwm_graph.Po' tmpdepfile='$(DEPDIR)/bwm_graph-bwm_graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -c -o bwm_graph-bwm_graph.obj `if test -f 'bwm_graph.c'; then $(CYGPATH_W) 'bwm_graph.c'; else $(CYGPATH_W) '$(srcdir)/bwm_graph.c'; fi`
-bwm_graph-bwm_graph.lo: bwm_graph.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.lo -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.lo `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Plo"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
-@AMD...
[truncated message content] |
|
From: <bwm...@li...> - 2004-12-28 15:17:16
|
Author: nkukard
Date: 2004-12-28 17:13:50 +0200 (Tue, 28 Dec 2004)
New Revision: 7
Modified:
trunk/lib/xmlConf.c
Log:
* Added check in config that burst-rate is greater than max-rate
Modified: trunk/lib/xmlConf.c
===================================================================
--- trunk/lib/xmlConf.c 2004-12-28 15:09:01 UTC (rev 6)
+++ trunk/lib/xmlConf.c 2004-12-28 15:13:50 UTC (rev 7)
@@ -1313,6 +1313,11 @@
p = g_hash_table_lookup(tagProperties,"burst-rate");
burstRate = p ? atol(p) : -1;
+ if (burstRate < maxRate && burstRate > 0)
+ {
+ fprintf(stderr,"ERROR: %s - Tag \"burst-rate\" cannot be less than max-rate\n",flowName);
+ burstRate = -1;
+ }
p = g_hash_table_lookup(tagProperties,"nfmark");
nfmark = p ? atol(p) : -1;
|
|
From: <bwm...@li...> - 2004-12-28 15:17:12
|
Author: nkukard Date: 2004-12-28 17:09:01 +0200 (Tue, 28 Dec 2004) New Revision: 6 Modified: trunk/bwm_firewall/Makefile.am trunk/bwm_firewall/Makefile.in trunk/bwmd/Makefile.am trunk/bwmd/Makefile.in Log: * Fixed build tools to use /etc ... etc, even if we have a different prefix Modified: trunk/bwm_firewall/Makefile.am =================================================================== --- trunk/bwm_firewall/Makefile.am 2004-12-23 20:07:27 UTC (rev 5) +++ trunk/bwm_firewall/Makefile.am 2004-12-28 15:09:01 UTC (rev 6) @@ -27,13 +27,13 @@ XML_CFLAGS=@XML_CFLAGS@ # Config stuff... -CONFIG_DIR=$(sysconfdir)/bwm_tools +CONFIG_DIR=/etc/bwm_tools CONFIG_FILE=$(CONFIG_DIR)/firewall.xml bin_PROGRAMS = bwm_firewall bwm_firewall_SOURCES = bwm_firewall.c bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la -bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS) +bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"/etc/sysconfig/iptables\" $(AM_CFLAGS) bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu Modified: trunk/bwm_firewall/Makefile.in =================================================================== --- trunk/bwm_firewall/Makefile.in 2004-12-23 20:07:27 UTC (rev 5) +++ trunk/bwm_firewall/Makefile.in 2004-12-28 15:09:01 UTC (rev 6) @@ -199,11 +199,11 @@ EXTRA_DIST = bwm_firewall.h # Config stuff... -CONFIG_DIR = $(sysconfdir)/bwm_tools +CONFIG_DIR = /etc/bwm_tools CONFIG_FILE = $(CONFIG_DIR)/firewall.xml bwm_firewall_SOURCES = bwm_firewall.c bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la -bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS) +bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"/etc/sysconfig/iptables\" $(AM_CFLAGS) bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu all: all-am Modified: trunk/bwmd/Makefile.am =================================================================== --- trunk/bwmd/Makefile.am 2004-12-23 20:07:27 UTC (rev 5) +++ trunk/bwmd/Makefile.am 2004-12-28 15:09:01 UTC (rev 6) @@ -23,9 +23,9 @@ XML_LIBS=@XML_LIBS@ XML_CFLAGS=@XML_CFLAGS@ -CONFIG_DIR=$(sysconfdir)/bwm_tools +CONFIG_DIR=/etc/bwm_tools CONFIG_FILE=$(CONFIG_DIR)/firewall.xml -LOG_DIR=@localstatedir@/bwm_tools +LOG_DIR=/var/bwm_tools bin_PROGRAMS = bwmd bwmd_SOURCES = report.c flowControl.c bwmd.c Modified: trunk/bwmd/Makefile.in =================================================================== --- trunk/bwmd/Makefile.in 2004-12-23 20:07:27 UTC (rev 5) +++ trunk/bwmd/Makefile.in 2004-12-28 15:09:01 UTC (rev 6) @@ -197,9 +197,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -CONFIG_DIR = $(sysconfdir)/bwm_tools +CONFIG_DIR = /etc/bwm_tools CONFIG_FILE = $(CONFIG_DIR)/firewall.xml -LOG_DIR = @localstatedir@/bwm_tools +LOG_DIR = /var/bwm_tools bwmd_SOURCES = report.c flowControl.c bwmd.c bwmd_LDADD = $(top_builddir)/lib/libbwm.la bwmd_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS) |
|
From: <bwm...@li...> - 2004-12-28 11:20:01
|
Author: nkukard
Date: 2004-12-23 22:07:27 +0200 (Thu, 23 Dec 2004)
New Revision: 5
Modified:
trunk/Makefile.in
trunk/aclocal.m4
trunk/bwm_firewall/Makefile.am
trunk/bwm_firewall/Makefile.in
trunk/bwm_graph/Makefile.am
trunk/bwm_graph/Makefile.in
trunk/bwm_monitor/Makefile.am
trunk/bwm_monitor/Makefile.in
trunk/bwmd/Makefile.am
trunk/bwmd/Makefile.in
trunk/configure
trunk/configure.ac
trunk/lib/Makefile.am
trunk/lib/Makefile.in
trunk/lib/xmlConf.c
Log:
* Various gnu build utils fixes, we should be 100% complient now
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13,6 +13,24 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#
+# makefile.am - Makefile for BWM Tools
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -33,6 +51,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -46,7 +65,7 @@
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
SOURCES =
@@ -134,6 +153,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -148,6 +168,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -177,7 +199,10 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = lib bwm_firewall bwm_graph bwmd bwm_monitor
-EXTRA_DIST = include/autoclass.h include/common.h include/flow.h include/flowControl.h include/ipq.h include/libipq.h include/misc.h include/report.h include/xmlConf.h doc/Configuration doc/Install doc/example.xml
+EXTRA_DIST = include/autoclass.h include/common.h include/flow.h \
+ include/flowControl.h include/ipq.h include/libipq.h \
+ include/misc.h include/report.h include/xmlConf.h \
+ doc/Configuration doc/Install doc/example.xml
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -316,14 +341,16 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -333,9 +360,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -389,15 +418,17 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || mkdir "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="../$(top_distdir)" \
- distdir="../$(distdir)/$$subdir" \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -408,15 +439,15 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-tarZ: distdir
- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
dist-shar: distdir
@@ -429,7 +460,7 @@
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -438,13 +469,13 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -467,7 +498,7 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkdir_p) "$$dc_destdir") \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
@@ -523,7 +554,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/aclocal.m4 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -18,7 +18,7 @@
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
dnl gthread is specified in MODULES, pass to pkg-config
dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
+AC_DEFUN([AM_PATH_GLIB_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
@@ -845,7 +845,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- testring="ABCD"
+ teststring="ABCD"
case $build_os in
msdosdjgpp*)
@@ -884,16 +884,16 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
- testring=$testring$testring
+ teststring=$teststring$teststring
done
- testring=
+ teststring=
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
@@ -1289,7 +1289,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext=".so"
+shrext_cmds=".so"
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -1402,7 +1402,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
+ shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
@@ -1467,7 +1467,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -1550,7 +1550,7 @@
need_version=no
case "$host_cpu" in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
@@ -1565,7 +1565,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
- shrext='.sl'
+ shrext_cmds='.sl'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -1576,7 +1576,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
- shrext='.sl'
+ shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -1647,8 +1647,8 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1730,7 +1730,7 @@
os2*)
libname_spec='$name'
- shrext=".dll"
+ shrext_cmds=".dll"
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
@@ -2321,14 +2321,14 @@
;;
cygwin*)
- # win32_libid is a shell function defined in ltmain.sh
+ # func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='win32_libid'
+ lt_cv_file_magic_cmd='func_win32_libid'
;;
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
@@ -2748,7 +2748,7 @@
fi
;;
-aix4*)
+aix4* | aix5*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -3196,7 +3196,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -3899,7 +3899,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+aix4* | aix5*)
test "$enable_shared" = yes && enable_static=no
;;
esac
@@ -4254,7 +4254,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -5362,7 +5362,7 @@
;;
linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
supports_anon_versioning=no
@@ -5562,7 +5562,7 @@
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext=".dll"
+ shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -6133,208 +6133,15 @@
])
# Configure paths for LIBXML2
+# Mike Hommey 2004-06-19
+# use CPPFLAGS instead of CFLAGS
# Toshio Kuratomi 2001-04-21
# Adapted from:
# Configure paths for GLIB
# Owen Taylor 97-11-3
-dnl AM_PATH_XML([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XML],[
-AC_ARG_WITH(xml-prefix,
- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
- xml_config_prefix="$withval", xml_config_prefix="")
-AC_ARG_WITH(xml-exec-prefix,
- [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
- xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
-AC_ARG_ENABLE(xmltest,
- [ --disable-xmltest Do not try to compile and run a test LIBXML program],,
- enable_xmltest=yes)
-
- if test x$xml_config_exec_prefix != x ; then
- xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
- if test x${XML_CONFIG+set} != xset ; then
- XML_CONFIG=$xml_config_exec_prefix/bin/xml-config
- fi
- fi
- if test x$xml_config_prefix != x ; then
- xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
- if test x${XML_CONFIG+set} != xset ; then
- XML_CONFIG=$xml_config_prefix/bin/xml-config
- fi
- fi
-
- AC_PATH_PROG(XML_CONFIG, xml-config, no)
- min_xml_version=ifelse([$1], ,1.0.0,[$1])
- AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
- no_xml=""
- if test "$XML_CONFIG" = "no" ; then
- no_xml=yes
- else
- XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags`
- XML_LIBS=`$XML_CONFIG $xml_config_args --libs`
- xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_xmltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$XML_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxml is sufficiently new.
-dnl (Also sanity checks the results of xml-config to some extent)
-dnl
- rm -f conf.xmltest
- AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/tree.h>
-
-int
-main()
-{
- int xml_major_version, xml_minor_version, xml_micro_version;
- int major, minor, micro;
- char *tmp_version;
- int tmp_int_version;
-
- system("touch conf.xmltest");
-
- /* Capture xml-config output via autoconf/configure variables */
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = (char *)strdup("$min_xml_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string from xml-config\n", "$min_xml_version");
- exit(1);
- }
- free(tmp_version);
-
- /* Capture the version information from the header files */
- tmp_int_version = LIBXML_VERSION;
- xml_major_version=tmp_int_version / 10000;
- xml_minor_version=(tmp_int_version - xml_major_version * 10000) / 100;
- xml_micro_version=(tmp_int_version - xml_minor_version * 100 - xml_major_version * 10000);
-
- /* Compare xml-config output to the libxml headers */
- if ((xml_major_version != $xml_config_major_version) ||
- (xml_minor_version != $xml_config_minor_version)
-#if 0
- ||
-/* The last released version of libxml-1.x has an incorrect micro version in
- * the header file so neither the includes nor the library will match the
- * micro_version to the output of xml-config
- */
- (xml_micro_version != $xml_config_micro_version)
-#endif
- )
-
- {
- printf("*** libxml header files (version %d.%d.%d) do not match\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** xml-config (version %d.%d.%d)\n",
- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
- return 1;
- }
-/* Compare the headers to the library to make sure we match */
- /* Less than ideal -- doesn't provide us with return value feedback,
- * only exits if there's a serious mismatch between header and library.
- */
- LIBXML_TEST_VERSION;
-
- /* Test that the library is greater than our minimum version */
- if (($xml_config_major_version > major) ||
- (($xml_config_major_version == major) && ($xml_config_minor_version > minor)) ||
- (($xml_config_major_version == major) && ($xml_config_minor_version == minor) &&
- ($xml_config_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the xml-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of LIBXML, but you can also set the XML_CONFIG environment to point to the\n");
- printf("*** correct copy of xml-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- return 1;
-}
-],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- if test "x$no_xml" = x ; then
- AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$XML_CONFIG" = "no" ; then
- echo "*** The xml-config script installed by LIBXML could not be found"
- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the XML_CONFIG environment variable to the"
- echo "*** full path to xml-config."
- else
- if test -f conf.xmltest ; then
- :
- else
- echo "*** Could not run libxml test program, checking why..."
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$LIBS $XML_LIBS"
- AC_TRY_LINK([
-#include <libxml/tree.h>
-#include <stdio.h>
-], [ LIBXML_TEST_VERSION; return 0;],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
- echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
- echo "*** may want to edit the xml-config script: $XML_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- XML_CFLAGS=""
- XML_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(XML_CFLAGS)
- AC_SUBST(XML_LIBS)
- rm -f conf.xmltest
-])
-
-# Configure paths for LIBXML2
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor 97-11-3
-
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
+dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
dnl
AC_DEFUN([AM_PATH_XML2],[
AC_ARG_WITH(xml-prefix,
@@ -6367,7 +6174,7 @@
if test "$XML2_CONFIG" = "no" ; then
no_xml=yes
else
- XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
+ XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -6376,9 +6183,9 @@
xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_xmltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XML_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$XML_LIBS $LIBS"
dnl
dnl Now check if the installed libxml is sufficiently new.
@@ -6461,7 +6268,7 @@
return 1;
}
],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
@@ -6481,7 +6288,7 @@
:
else
echo "*** Could not run libxml test program, checking why..."
- CFLAGS="$CFLAGS $XML_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
LIBS="$LIBS $XML_LIBS"
AC_TRY_LINK([
#include <libxml/xmlversion.h>
@@ -6500,16 +6307,16 @@
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
- XML_CFLAGS=""
+ XML_CPPFLAGS=""
XML_LIBS=""
ifelse([$3], , :, [$3])
fi
- AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_CPPFLAGS)
AC_SUBST(XML_LIBS)
rm -f conf.xmltest
])
@@ -6536,14 +6343,14 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.8.2])])
+ [AM_AUTOMAKE_VERSION([1.9.1])])
# AM_AUX_DIR_EXPAND
@@ -6611,7 +6418,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -6648,11 +6455,11 @@
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
fi])])
-# serial 6 -*- Autoconf -*-
+# serial 7 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -6739,7 +6546,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -6767,9 +6576,14 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
@@ -6815,7 +6629,8 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -6851,27 +6666,21 @@
else
continue
fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -6902,7 +6711,7 @@
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -6978,7 +6787,6 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -6987,7 +6795,9 @@
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
@@ -7220,21 +7030,37 @@
#
# Do not use -m 0755 and let people choose whatever they expect by
# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='mkdir -p -- .'
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
- for d in ./-p ./--;
+ for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
@@ -7394,3 +7220,111 @@
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
Modified: trunk/bwm_firewall/Makefile.am
===================================================================
--- trunk/bwm_firewall/Makefile.am 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_firewall/Makefile.am 2004-12-23 20:07:27 UTC (rev 5)
@@ -34,6 +34,6 @@
bin_PROGRAMS = bwm_firewall
bwm_firewall_SOURCES = bwm_firewall.c
bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
Modified: trunk/bwm_firewall/Makefile.in
===================================================================
--- trunk/bwm_firewall/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_firewall/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,6 +14,24 @@
@SET_MAKE@
+#
+# makefile.am - Makefile for BWM Firewall
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
SOURCES = $(bwm_firewall_SOURCES)
srcdir = @srcdir@
@@ -36,6 +54,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = bwm_firewall$(EXEEXT)
subdir = bwm_firewall
@@ -44,10 +63,10 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bwm_firewall_OBJECTS = bwm_firewall-bwm_firewall.$(OBJEXT)
@@ -56,14 +75,13 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bwm_firewall-bwm_firewall.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bwm_firewall_SOURCES)
DIST_SOURCES = $(bwm_firewall_SOURCES)
@@ -133,6 +151,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -147,6 +166,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -182,7 +203,7 @@
CONFIG_FILE = $(CONFIG_DIR)/firewall.xml
bwm_firewall_SOURCES = bwm_firewall.c
bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
all: all-am
@@ -219,15 +240,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -235,8 +256,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -261,50 +282,37 @@
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
bwm_firewall-bwm_firewall.o: bwm_firewall.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.o -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.o `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Po"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Po' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.o `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c
bwm_firewall-bwm_firewall.obj: bwm_firewall.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.obj -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.obj `if test -f 'bwm_firewall.c'; then $(CYGPATH_W) 'bwm_firewall.c'; else $(CYGPATH_W) '$(srcdir)/bwm_firewall.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Po"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Po' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.obj `if test -f 'bwm_firewall.c'; then $(CYGPATH_W) 'bwm_firewall.c'; else $(CYGPATH_W) '$(srcdir)/bwm_firewall.c'; fi`
-bwm_firewall-bwm_firewall.lo: bwm_firewall.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -MT bwm_firewall-bwm_firewall.lo -MD -MP -MF "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" -c -o bwm_firewall-bwm_firewall.lo `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo" "$(DEPDIR)/bwm_firewall-bwm_firewall.Plo"; else rm -f "$(DEPDIR)/bwm_firewall-bwm_firewall.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_firewall.c' object='bwm_firewall-bwm_firewall.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_firewall-bwm_firewall.Plo' tmpdepfile='$(DEPDIR)/bwm_firewall-bwm_firewall.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_firewall_CFLAGS) $(CFLAGS) -c -o bwm_firewall-bwm_firewall.lo `test -f 'bwm_firewall.c' || echo '$(srcdir)/'`bwm_firewall.c
-
mostlyclean-libtool:
-rm -f *.lo
@@ -335,9 +343,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -392,7 +402,9 @@
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
- $(mkdir_p) $(DESTDIR)$(bindir)
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -412,7 +424,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Modified: trunk/bwm_graph/Makefile.am
===================================================================
--- trunk/bwm_graph/Makefile.am 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_graph/Makefile.am 2004-12-23 20:07:27 UTC (rev 5)
@@ -29,7 +29,7 @@
bin_PROGRAMS = bwm_graph
bwm_graph_SOURCES = bwm_graph.c graph.c
bwm_graph_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_graph_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
+bwm_graph_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
bwm_graph_LDFLAGS = $(GLIB_LIBS) $(RRDTOOL_LIBS)
Modified: trunk/bwm_graph/Makefile.in
===================================================================
--- trunk/bwm_graph/Makefile.in 2004-12-23 18:03:47 UTC (rev 4)
+++ trunk/bwm_graph/Makefile.in 2004-12-23 20:07:27 UTC (rev 5)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,6 +14,24 @@
@SET_MAKE@
+#
+# makefile.am - Makefile for BWM Graph
+# Copyright (C) 2003-2004, Linux Based Systems Design
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
SOURCES = $(bwm_graph_SOURCES)
srcdir = @srcdir@
@@ -36,6 +54,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = bwm_graph$(EXEEXT)
subdir = bwm_graph
@@ -44,10 +63,10 @@
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bwm_graph_OBJECTS = bwm_graph-bwm_graph.$(OBJEXT) \
@@ -57,15 +76,13 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bwm_graph-bwm_graph.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/bwm_graph-graph.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bwm_graph_SOURCES)
DIST_SOURCES = $(bwm_graph_SOURCES)
@@ -135,6 +152,7 @@
VERSION = @VERSION@
XML2_CONFIG = @XML2_CONFIG@
XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -149,6 +167,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -181,7 +201,7 @@
LOG_DIR = @localstatedir@/bwm_tools
bwm_graph_SOURCES = bwm_graph.c graph.c
bwm_graph_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_graph_CFLAGS = -I$(top_builddir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
+bwm_graph_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)
bwm_graph_LDFLAGS = $(GLIB_LIBS) $(RRDTOOL_LIBS)
all: all-am
@@ -218,15 +238,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -234,8 +254,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -261,74 +281,51 @@
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
bwm_graph-bwm_graph.o: bwm_graph.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.o -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.o `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Po"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_graph.c' object='bwm_graph-bwm_graph.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_graph-bwm_graph.Po' tmpdepfile='$(DEPDIR)/bwm_graph-bwm_graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -c -o bwm_graph-bwm_graph.o `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c
bwm_graph-bwm_graph.obj: bwm_graph.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.obj -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.obj `if test -f 'bwm_graph.c'; then $(CYGPATH_W) 'bwm_graph.c'; else $(CYGPATH_W) '$(srcdir)/bwm_graph.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Po"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bwm_graph.c' object='bwm_graph-bwm_graph.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/bwm_graph-bwm_graph.Po' tmpdepfile='$(DEPDIR)/bwm_graph-bwm_graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -c -o bwm_graph-bwm_graph.obj `if test -f 'bwm_graph.c'; then $(CYGPATH_W) 'bwm_graph.c'; else $(CYGPATH_W) '$(srcdir)/bwm_graph.c'; fi`
-bwm_graph-bwm_graph.lo: bwm_graph.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bwm_graph_CFLAGS) $(CFLAGS) -MT bwm_graph-bwm_graph.lo -MD -MP -MF "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" -c -o bwm_graph-bwm_graph.lo `test -f 'bwm_graph.c' || echo '$(srcdir)/'`bwm_graph.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo" "$(DEPDIR)/bwm_graph-bwm_graph.Plo"; else rm -f "$(DEPDIR)/bwm_graph-bwm_graph.Tpo"; exit 1; fi
-@AMD...
[truncated message content] |
