[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl:[1567] trunk/plugins/rootFilterFormat/configure.in

[<ro...@us...>]

Revision: 1567
          http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1567&view=rev
Author:   ron-fox
Date:     2008-10-12 15:29:26 +0000 (Sun, 12 Oct 2008)

Log Message:
-----------
Deal with the presence or absenced of root-config as the correct way to build against root.
As near as I can tell, this changed somewhen in the middle of 5.18

Modified Paths:
--------------
    trunk/plugins/rootFilterFormat/configure.in

Modified: trunk/plugins/rootFilterFormat/configure.in
===================================================================
--- trunk/plugins/rootFilterFormat/configure.in	2008-10-03 13:15:53 UTC (rev 1566)
+++ trunk/plugins/rootFilterFormat/configure.in	2008-10-12 15:29:26 UTC (rev 1567)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT(RootFilterFormat, 1.0-001, fo...@ns...)
+AC_INIT(RootFilterFormat, 1.0-002, fo...@ns...)
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([configure.h])
 AC_CANONICAL_HOST
@@ -114,7 +114,10 @@
 	[ROOTSYS=$withval],
 	[ROOTSYS=""])
 
-if [ "${ROOTSYS}" =  "" ]; then
+if test -d $ROOTSYS
+then
+  AC_MSG_RESULT([ Root is installedi n $ROOTSYS])
+else
    AC_MSG_ERROR([ You must tell me where root is installed via --with-rootsys])
 fi
 
@@ -143,12 +146,15 @@
 
   # Root:
 
-  # for the CCSW, ROOTSYS/include works for 'old roots',
-  # ROOTSYS/include/root is needed for newer roots. >sigh<
-  # same crap for the lib stuff.
 
-  ROOTCCSW="-I${ROOTSYS}/include -I${ROOTSYS}/include/root"
-  ROOTLDSW="-L${ROOTSYS}/lib -L${ROOTSYS}/lib/root -lTree -lCore -lCint -ldl -Wl,\"-rpath=${ROOTSYS}/lib/root\""
+  if test -e $ROOTSYS/bin/root-config
+  then
+    ROOTCCSW=`${ROOTSYS}/bin/root-config --cflags`
+    ROOTLDSW=`${ROOTSYS}/bin/root-config --libs`
+  else
+    ROOTCCSW="-I${ROOTSYS}/include -I${ROOTSYS}/include/root"
+    ROOTLDSW="-L${ROOTSYS}/lib -L${ROOTSYS}/lib/root -lTree -lCore -lCint -ldl -Wl,\"-rpath=${ROOTSYS}/lib/root\""
+  fi
 
   AC_SUBST(ROOTCCSW)
   AC_SUBST(ROOTLDSW)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.