diff -uNr 5.11.02.ORIG/config/Makefile.linux 5.11.02/config/Makefile.linux --- 5.11.02.ORIG/config/Makefile.linux 2006-03-02 17:34:54.000000000 +0900 +++ 5.11.02/config/Makefile.linux 2006-04-30 18:45:53.000000000 +0900 @@ -44,12 +44,13 @@ CRYPTLIBS = -lcrypt # Fortran: -F77 = g77 +F77 = gfortran F77FLAGS = -fPIC -ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so) -F77LIBS := $(shell $(F77) -print-file-name=libg2c.so) -lnsl -else -F77LIBS := $(shell $(F77) -print-file-name=libg2c.a) -lnsl -endif +#ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so) +#F77LIBS := $(shell $(F77) -print-file-name=libg2c.so) -lnsl +#else +#F77LIBS := $(shell $(F77) -print-file-name=libg2c.a) -lnsl +#endif +F77LIBS := -lgfortran -lgfortranbegin -lnsl # Extras diff -uNr 5.11.02.ORIG/config/Makefile.macosx 5.11.02/config/Makefile.macosx --- 5.11.02.ORIG/config/Makefile.macosx 2006-04-11 20:02:50.000000000 +0900 +++ 5.11.02/config/Makefile.macosx 2006-04-30 18:47:06.000000000 +0900 @@ -22,16 +22,16 @@ # LD = c++ CXX = g++ CC = gcc -CXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ +CXXFLAGS = -pipe -W -Wall -Woverloaded-virtual \ -fsigned-char -fno-common $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) -CFLAGS = -pipe -W -Wall -Wno-long-double -fsigned-char -fno-common \ +CFLAGS = -pipe -W -Wall -fsigned-char -fno-common \ $(EXTRA_CFLAGS) $(FINK_CFLAGS) -CINTCXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ +CINTCXXFLAGS = -pipe -W -Wall -Woverloaded-virtual \ -fsigned-char -fno-common $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \ -DG__STD_EXCEPTION -CINTCFLAGS = -pipe -W -Wall -Wno-long-double -fsigned-char -fno-common \ +CINTCFLAGS = -pipe -W -Wall -fsigned-char -fno-common \ $(EXTRA_CFLAGS) $(FINK_CFLAGS) \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \ @@ -47,7 +47,8 @@ LD = g++ LDFLAGS = $(OPT) -bind_at_load FORCELINK = yes -NEEDFINK = yes +#NEEDFINK = yes +NEEDFINK = no ifeq ($(MACOSX_MINOR),4) MACOSXTARGET = MACOSX_DEPLOYMENT_TARGET=10.4 SOFLAGS = $(OPT) -dynamiclib -single_module \ @@ -81,14 +82,14 @@ else F77 = gfortran F77LIBS = -L$(FINK_DIR)/lib/gcc4/lib -lgfortran -lgfortranbegin \ - -L$(FINK_DIR)/lib -lg2c +# -L$(FINK_DIR)/lib -lg2c endif else F77 = g77 F77LIBS = -lg2c endif -ifeq ($(shell find $(FINK_DIR)/bin -name $(F77)),) +ifeq ($(shell which $(F77)),) BUILDHBOOK := no endif diff -uNr 5.11.02.ORIG/config/root-config.in 5.11.02/config/root-config.in --- 5.11.02.ORIG/config/root-config.in 2006-04-17 01:46:42.000000000 +0900 +++ 5.11.02/config/root-config.in 2006-04-30 18:45:53.000000000 +0900 @@ -295,7 +295,6 @@ forcelibs=$rootulibs forceglibs=$rootuglibs else - auxcflags="-Wno-long-double" auxlibs="-lm -ldl" fi ;; @@ -312,7 +311,7 @@ macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` # cannot find the one linked to libGraf if relocated after built rootlibs="$rootlibs -lfreetype" - auxcflags="-m64 -Wno-long-double" + auxcflags="-m64" auxldflags="-m64" auxlibs="-lm -ldl" ;;