Some fixes for explicit linking:

- search for libpng on OSX in /usr/X11
- link builtin libpng with -lz
- link builtin freetype with -lz
- allow ALICE special way of linking with private libPythia6


git-svn-id: http://root.cern.ch/svn/root/trunk@40301 27541ba8-7e3a-0410-8455-c3a389f83636

Makefile

@@ -754,7 +754,8 @@ $(COMPILEDATA): $(ROOT_SRCDIR)/config/Makefile.$(ARCH) config/Makefile.comp \
 	@$(MAKECOMPDATA) $(COMPILEDATA) "$(CXX)" "$(OPTFLAGS)" "$(DEBUGFLAGS)" \
 	   "$(CXXFLAGS)" "$(SOFLAGS)" "$(LDFLAGS)" "$(SOEXT)" "$(SYSLIBS)" \
 	   "$(LIBDIR)" "$(BOOTLIBS)" "$(RINTLIBS)" "$(INCDIR)" \
-	   "$(MAKESHAREDLIB)" "$(MAKEEXE)" "$(ARCH)" "$(ROOTBUILD)" "$(EXPLICITLINK)"
+	   "$(MAKESHAREDLIB)" "$(MAKEEXE)" "$(ARCH)" "$(ROOTBUILD)" \
+	   "$(EXPLICITLINK)"
 
 ifeq ($(HOST),)
 build/dummy.d: config Makefile $(ALLHDRS) $(RMKDEP) $(BINDEXP)

config/Makefile.depend

@@ -446,10 +446,8 @@ X3DLIBEXTRA             = -Llib -lGraf3d -lGui
 EGLIBEXTRA              = -Llib -lGraf3d -lGraf -lGpad -lMathCore
 VMCLIBEXTRA             = -Llib -lEG -lGeom -lMathCore
 PHYSICSLIBEXTRA         = -Llib -lMatrix -lMathCore
-PYTHIA6LIBEXTRA         = -Llib -lEG -lGraf -lVMC -lPhysics $(FPYTHIA6LIBDIR) \
-                          $(FPYTHIA6LIB)
-PYTHIA8LIBEXTRA         = -Llib -lEG -lGraf -lVMC -lPhysics $(FPYTHIA8LIBDIR) \
-                          $(FPYTHIA8LIB)
+PYTHIA6LIBEXTRA         = -Llib -lEG -lGraf -lVMC -lPhysics
+PYTHIA8LIBEXTRA         = -Llib -lEG -lGraf -lVMC -lPhysics
 X11TTFLIBEXTRA          = -Llib -lGX11 -lGraf
 TABLELIBEXTRA           = -Llib -lTree -lGpad -lGraf3d -lGraf -lHist -lRIO \
                           -lMathCore

configure

@@ -3419,6 +3419,10 @@ if test ! "x$enable_pythia6" = "xno" ; then
         pythia6cppflags=-DPYTHIA6_${pythia6uscore}_UNDERSCORE
         pythia6lib=
         pythia6dir=
+        case $platform in
+            macosx) pythia6lib="-undefined dynamic_lookup" ;;
+            linux) 
+        esac
         result "Using custom pythia6 library with $pythia6uscore underscore"
     else
         check_library "libPythia6" "$enable_shared" "$pythia6libdir" \
@@ -3826,8 +3830,8 @@ if test ! "x$enable_asimage" = "xno" ; then
           $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
           ${ASPNG:+$ASPNG/include} \
           ${finkdir:+$finkdir/include} \
-          /usr/local/include /usr/include /usr/local/include/libpng \
-          /opt/include
+          /usr/local/include /usr/X11/include /usr/include \
+          /usr/local/include/libpng /opt/include
        aspngincdir=$found_dir
        if test ! "x$enable_astiff" = "xno" ; then
            check_header "tiffio.h" "" \
@@ -3861,7 +3865,7 @@ if test ! "x$enable_asimage" = "xno" ; then
            check_library $k "$enable_shared" "" \
                $ASIMAGE ${ASIMAGE:+$ASIMAGE/lib} ${ASPNG:+$ASPNG/lib} \
                ${finkdir:+$finkdir/lib} \
-               /usr/local/lib /usr/lib /opt/lib
+               /usr/local/lib /usr/X11/lib /usr/lib /opt/lib
            if test "x$k" = "xlibz" ; then
                found_libz=$found_lib
                found_dirz=$found_dir

graf2d/asimage/Module.mk

@@ -36,7 +36,8 @@ else
 ASTEPLIBA    := $(ASTEPDIRS)/libAfterImage.a
 ASTEPLIB     := $(LPATH)/libAfterImage.a
 endif
-ifeq ($(MACOSX_MINOR),3)
+ifeq ($(ASPNGINCDIR),)
+# needed for the afterimage built-in libpng
 ASEXTRALIB   += -lz
 endif
 ASTEPDEP     := $(ASTEPLIB)

graf2d/freetype/Module.mk

@@ -30,6 +30,7 @@ FREETYPEDIRI := $(FREETYPEDIRS)/$(FREETYPEVERS)/include
 
 ##### libfreetype #####
 FREETYPELIBS := $(MODDIRS)/$(FREETYPEVERS).tar.gz
+FREETYPELDFLAGS :=
 ifeq ($(PLATFORM),win32)
 FREETYPELIB  := $(LPATH)/libfreetype.lib
 ifeq (yes,$(WINRTDEBUG))
@@ -42,10 +43,10 @@ endif
 else
 FREETYPELIBA := $(call stripsrc,$(MODDIRS)/$(FREETYPEVERS)/objs/.libs/libfreetype.a)
 FREETYPELIB  := $(LPATH)/libfreetype.a
+FREETYPELDFLAGS := -lz
 endif
 FREETYPEINC  := $(FREETYPEDIRI:%=-I%)
 FREETYPEDEP  := $(FREETYPELIB)
-FREETYPELDFLAGS :=
 
 ##### local rules #####
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)