[Opensrf-commits] r1418 - in trunk: . src src/gateway src/perl/lib/OpenSRF

[svn at svn.open-ils.org]

Author: sboyette
Date: 2008-08-18 15:14:00 -0400 (Mon, 18 Aug 2008)
New Revision: 1418

Added:
   trunk/src/perl/
Removed:
   trunk/src/perlmods/
Modified:
   trunk/Makefile.am
   trunk/src/Makefile.am
   trunk/src/gateway/Makefile.am
   trunk/src/perl/lib/OpenSRF/
Log:
merging perl CPANification/normalization branch work

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-08-13 17:47:17 UTC (rev 1417)
+++ trunk/Makefile.am	2008-08-18 19:14:00 UTC (rev 1418)
@@ -70,7 +70,7 @@
 		@srcdir@/src/libopensrf/osrfConfig.c
 
 
-EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES) $(python_FILES) $(java_FILES) @srcdir@/autogen.sh @srcdir@/src/extras @srcdir@/DCO-1.1.txt @srcdir@/LICENSE.txt @srcdir@/src/perlmods @srcdir@/src/javascript
+EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES) $(python_FILES) $(java_FILES) @srcdir@/autogen.sh @srcdir@/src/extras @srcdir@/DCO-1.1.txt @srcdir@/LICENSE.txt @srcdir@/src/perl @srcdir@/src/javascript
 
 opensrfincludedir = @includedir@/opensrf
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-08-13 17:47:17 UTC (rev 1417)
+++ trunk/src/Makefile.am	2008-08-18 19:14:00 UTC (rev 1418)
@@ -17,7 +17,6 @@
 export OPENSRF	= opensrf
 export BINDIR	= @bindir@
 export LIBDIR	= @libdir@
-perldir	= $(LIBDIR)/perl5
 jsdir = $(LIBDIR)/javascript
 export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
 etcdir = $(ETCDIR)
@@ -47,7 +46,7 @@
 	mkdir -p $(LOG)
 	mkdir -p $(SOCK)
 	mkdir -p $(jsdir)
-	mkdir -p $(perldir)
+	make install-perl
 
 install-exec-hook:
 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
@@ -60,12 +59,24 @@
 	sed -i 's|LIBDIR|$(LIBDIR)|g' '@abs_top_srcdir@/examples/multisession-test.pl'
 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '@abs_top_srcdir@/doc/dokuwiki-doc-stubber.pl'
 	cp -r @srcdir@/javascript/* $(jsdir)/
-	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '@srcdir@/perlmods/OpenSRF/Utils/Config.pm'
-	cp -r @srcdir@/perlmods/* $(perldir)/
 
 
+install-perl:
+	cd ./perl && perl Makefile.PL || make -s install-perl-fail
+	make -C perl
+	make -C perl test || make -s install-perl-fail
+	make -C perl install
+
+install-perl-fail:
+	echo
+	echo ">>> Installation of Perl modules has failed. The most likely"
+	echo ">>> possibility is that a dependency is not pre-installed"
+	echo ">>> or that a test has failed."
+	echo ">>> See the messages above this one for more information."
+	echo
+	exit 1
+
 uninstall-hook:
 	rm @includedir@/opensrf/apachetools.h
 	rm -R $(jsdir)
-	rm -R $(perldir)
 

Modified: trunk/src/gateway/Makefile.am
===================================================================
--- trunk/src/gateway/Makefile.am	2008-08-13 17:47:17 UTC (rev 1417)
+++ trunk/src/gateway/Makefile.am	2008-08-18 19:14:00 UTC (rev 1418)
@@ -18,6 +18,10 @@
 AM_LDFLAGS = -L$(LIBDIR) -L at top_builddir@/src/libopensrf
 
 install-exec-local: 
+	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
+		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
+		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
+	fi
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
 	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la

Copied: trunk/src/perl (from rev 1417, branches/sboyette/src/perl)