Merge pull request #6 from pinkenburg/master

prepare for Root 6
sPHENIX-Collaboration · Jul 3, 2017 · d9817e8 · d9817e8
2 parents b51a40c + 462f2ce
commit d9817e8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/newbasic/Makefile.am b/newbasic/Makefile.am
@@ -223,7 +223,7 @@ msgheaders = \
   remote_msg_buffer.h \
   strnstr.h 
 
-INCLUDES = -I$(includedir)  -I@ROOTINC@ -I$(OPT_SPHENIX)/include
+AM_CPPFLAGS = -I$(includedir)  -I@ROOTINC@ -I$(OPT_SPHENIX)/include
 
 noinst_HEADERS = \
   eventLinkDef.h \
@@ -336,7 +336,7 @@ msg_dict.C : \
   filter_msg_buffer.h \
   remote_msg_buffer.h \
   msgLinkDef.h
-	rootcint -f $@ -c $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $^
+	rootcint -f $@ @CINTDEFS@ -c $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $^
 
 libRootmessage_la_LIBADD = libmessage.la
 
@@ -364,13 +364,13 @@ event_dict.C : \
   packet.h \
   testEventiterator.h \
   eventLinkDef.h
-	rootcint -f $@ -c $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $^
-
+	rootcint -f $@ @CINTDEFS@ -c $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $^
 
 
 # clean cache dir on Solaris 5.8
 clean-local:
 	rm -rf SunWS_cache
+	rm -f *.pcm
 
 #if VXWORKS
 endif
diff --git a/newbasic/configure.in → newbasic/configure.ac b/newbasic/configure.in → newbasic/configure.ac
@@ -1,5 +1,6 @@
+AC_INIT(configure.ac)
+AC_CONFIG_SRCDIR([configure.ac])
 
-AC_INIT(configure.in)
 
 AM_CONDITIONAL(VXWORKS, false)
 AM_CONDITIONAL(LINUX, false)
@@ -13,15 +14,13 @@ AC_PROG_CXX(cxx CC g++)
 case "$host" in
   *-*-linux*)
     CPPFLAGS="$CPPFLAGS -DLinux"
-    AC_ENABLE_STATIC(no)
-    AC_ENABLE_SHARED(yes)
+    LT_INIT([disable-static])
     AM_CONDITIONAL(LINUX, true)
   ;;
   *-*-osf*)
     CPPFLAGS="$CPPFLAGS -DOSF1 -D_BSD"
     LIBS="-lm"
-    AC_ENABLE_STATIC(no)
-    AC_ENABLE_SHARED(yes)
+    LT_INIT([disable-static])
   ;;
   *-*-solaris2.6)
   ;;
@@ -31,8 +30,7 @@ dnl Chris: default flags with optimizer screw shared lib
 dnl  CXXFLAGS="+p -mt -g -xildoff"
     CXXFLAGS="$CXXFLAGS +p -mt -fast -xO5"
     LIBS="-lm -lc -lsocket -lrt -lnsl -lresolv"
-    AC_ENABLE_STATIC(yes)
-    AC_ENABLE_SHARED(no)
+    LT_INIT([disable-shared])
   ;;
   powerpc-wrs-vxworks)
     AM_CONDITIONAL(VXWORKS, true)
@@ -55,8 +53,6 @@ AM_INIT_AUTOMAKE(Event,1.00)
 
 AC_PROG_INSTALL
 
-AC_PROG_LIBTOOL
-
 dnl   no point in suppressing warnings people should 
 dnl   at least see them, so here we go for g++: -Wall
 if test $ac_cv_prog_gxx = yes; then
@@ -72,6 +68,11 @@ ROOTGLIBS=`root-config --glibs`
 ROOTINC=`root-config --incdir`
 AC_SUBST(ROOTGLIBS)
 AC_SUBST(ROOTINC)
+dnl test for root 6
+if test `root-config --version | gawk '{print $1>=6.?"1":"0"}'` = 1; then
+CINTDEFS=" -noIncludePaths  -inlineInputHeader "
+AC_SUBST(CINTDEFS)
+fi
 
 LZOLIB="-llzo2"
 AC_SUBST(LZOLIB)
@@ -137,5 +138,5 @@ AC_ARG_ENABLE(demos,
 	demos=true)
 AM_CONDITIONAL(DEMOS, test "$demos" = true)
 
-AC_OUTPUT(Makefile)
-
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/pmonitor/Makefile.am b/pmonitor/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES = pmonitor_dict.C
 #ROOTCINT =  $(ROOTSYS)/bin/rootcint 
 ROOTCINT =  rootcint 
 
-INCLUDES =  -I$(includedir) -I$(ONLINE_MAIN)/include -I@ROOTINC@
+AM_CPPFLAGS =  -I$(includedir) -I$(ONLINE_MAIN)/include -I@ROOTINC@
 
 lib_LTLIBRARIES = libpmonitor.la
 
@@ -60,10 +60,10 @@ endif
 
 
 pmonitor_dict.C: pmonitor.h pmonstate.h pmondisplay.h pmongui.h $(LINKFILE)
-	$(ROOTCINT) -f $@ -c $(DEFAULT_INCLUDES) $(INCLUDES) $^
-
+	$(ROOTCINT) -f $@ @CINTDEFS@ -c $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $^
 
 bin_SCRIPTS = writePmonProject.pl
 
 clean-local:
 	rm *_dict.*
+	rm -f *.pcm
diff --git a/pmonitor/configure.in → pmonitor/configure.ac b/pmonitor/configure.in → pmonitor/configure.ac
@@ -1,16 +1,17 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(configure.in)
+AC_INIT(pmonitor,[1.00])
+AC_CONFIG_SRCDIR([configure.ac])
 
 dnl Checks for C++ compiler and sets default flags
 AC_PROG_CXX(cxx CC g++)
 
-AM_INIT_AUTOMAKE(pmonitor,1.00)
+AM_INIT_AUTOMAKE
 
 
 AC_CANONICAL_HOST
 
-AC_ENABLE_STATIC(no)
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
+
 AC_PROG_INSTALL
 
 
@@ -25,6 +26,11 @@ ROOTINC=`root-config --incdir`
 AC_SUBST(ROOTLIBS)
 AC_SUBST(ROOTINC)
 
+dnl test for root 6
+if test `root-config --version | gawk '{print $1>=6.?"1":"0"}'` = 1; then
+CINTDEFS=" -noIncludePaths  -inlineInputHeader "
+AC_SUBST(CINTDEFS)
+fi
 
 AC_CHECK_FILE( $OFFLINE_MAIN/include/FROG.h,have_frog=yes, have_frog=no)
 AC_MSG_RESULT([$have_frog])
@@ -35,6 +41,5 @@ if test $have_frog = yes; then
   AC_DEFINE(HAVE_FROG)
 fi
 
-
-
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT