Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r395 - trunk: . fsvs/src

fsvs
Discussion topic

Hide all messages in topic

All messages in topic

svn commit: r395 - trunk: . fsvs/src

Author pmarek
Full name P.Marek
Date 2006-08-20 11:37:15 PDT
Message Author: pmarek
Date: 2006-08-20 11:37:15-0700
New Revision: 395

Modified:
   trunk/ (props changed)
   trunk/fsvs/src/Makefile.in
   trunk/fsvs/src/checksum.c
   trunk/fsvs/src/commit.c
   trunk/fsvs/src/fsvs.c
   trunk/fsvs/src/global.h
   trunk/fsvs/src/helper.c
   trunk/fsvs/src/sync.c
   trunk/fsvs/src/update.c
   trunk/fsvs/src/waa.c

Log:
Change the #include <apr-0/...> back; depending on apr version
it's a apr-1/..., and the subversion headers include without directory,
so the headers must be directly reachable.




Modified: trunk/fsvs/src/Makefile.in
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/Mak​efile.in?view=diff​&rev=395&p1=tr​unk/fsvs/src/Makefil​e.in&p2=trunk/fs​vs/src/Makefile.in​&r1=394&r2=395​
====================​====================​====================​==================
--- trunk/fsvs/src/Makefile.in (original)
+++ trunk/fsvs/src/Makefile.in 2006-08-20 11:37:15-0700
@@ -13,16 +13,19 @@
 
 # using -I would result in the files being _non_ system include directories,
 # ie. they'd clutter the dependency files.
+INCDIRS := /usr/local/include /usr/include /openpkg/include
+INCS := $(foreach dir, $(INCDIRS), -idirafter $(dir))
 # The subversion headers do a #include <apr_pools.h>, so the APR libraries
 # *have* to be directly specified.
-INCS := -idirafter /usr/local/include -idirafter /usr/include -idirafter /openpkg/include
-INCSAPR := -idirafter /usr/local/include/apr-0 -idirafter /usr/include/apr-0 -idirafter /openpkg/include/apr-0
+# Furthermore there's apr-1/ as directory name, depending on apr version.
+INCS += $(foreach dir, $(INCDIRS), -idirafter $(dir)/apr-0)
+INCS += $(foreach dir, $(INCDIRS), -idirafter $(dir)/apr-1)
 
 HEADURL := "$URL$"
 HEADREV := "$Revision$"
 VERSION = $(shell perl -e '($$r) = (q( $(HEADREV) ) =~ m:(\d+):); $$t= q( $(HEADURL) ) =~ m:/tags/([^/]+): ? $$1 : "trunk"; print "$$t:$$r\n";' )
 
-CFLAGS += -Wall -funsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 $(INCS) $(INCSAPR) -Os -DFSVS_VERSION='"$(VERSION)"'
+CFLAGS += -Wall -funsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 $(INCS) -Os -DFSVS_VERSION='"$(VERSION)"'
 LDFLAGS += -L/usr/local/lib -L/openpkg/lib -lsvn_subr-1 -lsvn_ra-1 -lsvn_client-1 -lpcre
 
 ifeq (@ENABLE_DEBUG@, 1)

Modified: trunk/fsvs/src/checksum.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/che​cksum.c?view=diff​&rev=395&p1=tru​nk/fsvs/src/checksum​.c&p2=trunk/fsvs​/src/checksum.c&​r1=394&r2=395
====================​====================​====================​==================
--- trunk/fsvs/src/checksum.c (original)
+++ trunk/fsvs/src/checksum.c 2006-08-20 11:37:15-0700
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <apr-0/apr_md5.h>
+#include <apr_md5.h>
 #include <sys/mman.h>
 
 #include "checksum.h"

Modified: trunk/fsvs/src/commit.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/com​mit.c?view=diff&​rev=395&p1=trunk​/fsvs/src/commit.c​&p2=trunk/fsvs/src​/commit.c&r1=394​&r2=395
====================​====================​====================​==================
--- trunk/fsvs/src/commit.c (original)
+++ trunk/fsvs/src/commit.c 2006-08-20 11:37:15-0700
@@ -16,10 +16,10 @@
  * We have to traverse the complete tree, store what we want to do,
  * and do that in a second run.
  * */
-#include <apr-0/apr_md5.h>
-#include <apr-0/apr_pools.h>
-#include <apr-0/apr_user.h>
-#include <apr-0/apr_file_io.h>
+#include <apr_md5.h>
+#include <apr_pools.h>
+#include <apr_user.h>
+#include <apr_file_io.h>
 #include <subversion-1/svn​_delta.h>
 #include <subversion-1/svn_ra.h>
 #include <subversion-1/svn​_error.h>

Modified: trunk/fsvs/src/fsvs.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/fsv​s.c?view=diff&re​v=395&p1=trunk/f​svs/src/fsvs.c&p​2=trunk/fsvs/src/fsv​s.c&r1=394&r​2=395
====================​====================​====================​==================
--- trunk/fsvs/src/fsvs.c (original)
+++ trunk/fsvs/src/fsvs.c 2006-08-20 11:37:15-0700
@@ -16,7 +16,7 @@
 #include <langinfo.h>
 #include <locale.h>
 
-#include <apr-0/apr_pools.h>
+#include <apr_pools.h>
 
 #include <subversion-1/svn​_props.h>
 #include <subversion-1/svn​_error.h>

Modified: trunk/fsvs/src/global.h
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/glo​bal.h?view=diff&​rev=395&p1=trunk​/fsvs/src/global.h​&p2=trunk/fsvs/src​/global.h&r1=394​&r2=395
====================​====================​====================​==================
--- trunk/fsvs/src/global.h (original)
+++ trunk/fsvs/src/global.h 2006-08-20 11:37:15-0700
@@ -14,8 +14,8 @@
 #include <sys/stat.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <apr-0/apr_md5.h>
-#include <apr-0/apr_file_io.h>
+#include <apr_md5.h>
+#include <apr_file_io.h>
 #include <subversion-1/svn_ra.h>
 #include <subversion-1/svn​_string.h>
 #include <pcre.h>

Modified: trunk/fsvs/src/helper.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/hel​per.c?view=diff&​rev=395&p1=trunk​/fsvs/src/helper.c​&p2=trunk/fsvs/src​/helper.c&r1=394​&r2=395
====================​====================​====================​==================
--- trunk/fsvs/src/helper.c (original)
+++ trunk/fsvs/src/helper.c 2006-08-20 11:37:15-0700
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  ********************​********************​********************​************/
 
-#include <apr-0/apr_md5.h>
+#include <apr_md5.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>

Modified: trunk/fsvs/src/sync.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/syn​c.c?view=diff&re​v=395&p1=trunk/f​svs/src/sync.c&p​2=trunk/fsvs/src/syn​c.c&r1=394&r​2=395
====================​====================​====================​==================
--- trunk/fsvs/src/sync.c (original)
+++ trunk/fsvs/src/sync.c 2006-08-20 11:37:15-0700
@@ -14,10 +14,10 @@
  * we fetch the new values from the repository.
  *
  * */
-#include <apr-0/apr_md5.h>
-#include <apr-0/apr_pools.h>
-#include <apr-0/apr_user.h>
-#include <apr-0/apr_file_io.h>
+#include <apr_md5.h>
+#include <apr_pools.h>
+#include <apr_user.h>
+#include <apr_file_io.h>
 #include <subversion-1/svn​_delta.h>
 #include <subversion-1/svn_ra.h>
 #include <subversion-1/svn​_error.h>

Modified: trunk/fsvs/src/update.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/upd​ate.c?view=diff&​rev=395&p1=trunk​/fsvs/src/update.c​&p2=trunk/fsvs/src​/update.c&r1=394​&r2=395
====================​====================​====================​==================
--- trunk/fsvs/src/update.c (original)
+++ trunk/fsvs/src/update.c 2006-08-20 11:37:15-0700
@@ -14,10 +14,10 @@
  * we fetch the new values from the repository.
  *
  * */
-#include <apr-0/apr_md5.h>
-#include <apr-0/apr_pools.h>
-#include <apr-0/apr_user.h>
-#include <apr-0/apr_file_io.h>
+#include <apr_md5.h>
+#include <apr_pools.h>
+#include <apr_user.h>
+#include <apr_file_io.h>
 #include <subversion-1/svn​_delta.h>
 #include <subversion-1/svn_ra.h>
 #include <subversion-1/svn​_error.h>

Modified: trunk/fsvs/src/waa.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/waa​.c?view=diff&rev​=395&p1=trunk/fs​vs/src/waa.c&p2=​trunk/fsvs/src/waa.c​&r1=394&r2=3​95
====================​====================​====================​==================
--- trunk/fsvs/src/waa.c (original)
+++ trunk/fsvs/src/waa.c 2006-08-20 11:37:15-0700
@@ -10,8 +10,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <apr-0/apr_pools.h>
-#include <apr-0/apr_md5.h>
+#include <apr_pools.h>
+#include <apr_md5.h>
 #include <subversion-1/svn_md5.h>
 #include <unistd.h>
 #include <time.h>
Messages per page: