Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 280925 | Differences between
and this patch

Collapse All | Expand All

(-)root.orig/configure (-8 / +8 lines)
Lines 2121-2128 Link Here
2121
if test ! "x$enable_pgsql" = "xno"; then
2121
if test ! "x$enable_pgsql" = "xno"; then
2122
    # Check for PgSQL include and library
2122
    # Check for PgSQL include and library
2123
    check_header "libpq-fe.h" "$pgsqlincdir" $PGSQL $PGSQL/include \
2123
    check_header "libpq-fe.h" "$pgsqlincdir" $PGSQL $PGSQL/include \
2124
	/usr/include /usr/local/include /usr/local/pgsql/include \
2124
	/usr/include/postgresql /usr/include /usr/local/include \
2125
        /usr/include/pgsql /usr/include/postgresql \
2125
	/usr/local/pgsql/include /usr/include/pgsql \
2126
	/usr/include/postgresql/8.0 /usr/pgsql/include \
2126
	/usr/include/postgresql/8.0 /usr/pgsql/include \
2127
        /usr/local/include/pgsql /usr/local/include/postgresql \
2127
        /usr/local/include/pgsql /usr/local/include/postgresql \
2128
	/usr/include/postgresql/8.0 /usr/pgsql /usr/local/pgsql \
2128
	/usr/include/postgresql/8.0 /usr/pgsql /usr/local/pgsql \
Lines 2204-2210 Link Here
2204
    else
2204
    else
2205
        check_header "sqlext.h" "$odbcincdir" \
2205
        check_header "sqlext.h" "$odbcincdir" \
2206
            $ODBC $ODBC/include $ODBCINCDIR /usr/local/include \
2206
            $ODBC $ODBC/include $ODBCINCDIR /usr/local/include \
2207
            /usr/include $finkdir/include
2207
            /usr/include $finkdir/include /usr/include/iodbc
2208
        odbcinc=$found_hdr
2208
        odbcinc=$found_hdr
2209
        odbcincdir=$found_dir
2209
        odbcincdir=$found_dir
2210
2210
Lines 2304-2310 Link Here
2304
	    check_library "libQtCore QtCore QtCore$qt4suffix QtCore4" \
2304
	    check_library "libQtCore QtCore QtCore$qt4suffix QtCore4" \
2305
		"$enable_shared" \
2305
		"$enable_shared" \
2306
		"$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib \
2306
		"$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib \
2307
		/usr/local/qt/lib /usr/lib /usr/qt/lib
2307
		/usr/local/qt/lib /usr/lib /usr/qt/lib /usr/lib/qt4
2308
	    qtlib=$found_lib
2308
	    qtlib=$found_lib
2309
	    qtlibdir=$found_dir
2309
	    qtlibdir=$found_dir
2310
	    check_library "libQtGui QtGui QtGui$qt4suffix QtGui4" \
2310
	    check_library "libQtGui QtGui QtGui$qt4suffix QtGui4" \
Lines 2588-2601 Link Here
2588
        G4SYSLIBDIR=$G4LIB/$G4SYSTEM
2588
        G4SYSLIBDIR=$G4LIB/$G4SYSTEM
2589
    fi
2589
    fi
2590
    check_library "libG4navigation" "$enable_shared" "$g4libdir" \
2590
    check_library "libG4navigation" "$enable_shared" "$g4libdir" \
2591
	$G4SYSLIBDIR /opt/geant4/lib /opt/g4/lib /usr/local/lib /usr/lib
2591
	$G4SYSLIBDIR /opt/geant4/lib /opt/g4/lib /usr/local/lib /usr/lib /usr/lib/geant4
2592
2592
2593
    g4rootlib=$found_lib
2593
    g4rootlib=$found_lib
2594
    g4libdir=$found_dir
2594
    g4libdir=$found_dir
2595
2595
2596
    # Check for CLHEP include
2596
    # Check for CLHEP include
2597
    check_header "CLHEP/Vector/Rotation.h" "$clhepincdir" "$clhepincdir" \
2597
    check_header "CLHEP/Vector/Rotation.h" "$clhepincdir" "$clhepincdir" \
2598
        $CLHEP_INCLUDE_DIR
2598
        $CLHEP_INCLUDE_DIR /usr/include
2599
    clhepinc=$found_hdr
2599
    clhepinc=$found_hdr
2600
    clhepincdir=$found_dir
2600
    clhepincdir=$found_dir
2601
2601
Lines 2736-2742 Link Here
2736
if test ! "x$enable_pythia8" = "xno" ; then
2736
if test ! "x$enable_pythia8" = "xno" ; then
2737
    # Check for PYTHIA8 include and library
2737
    # Check for PYTHIA8 include and library
2738
    check_header "Pythia.h" "$pythia8incdir" $PYTHIA8 $PYTHIA8/include \
2738
    check_header "Pythia.h" "$pythia8incdir" $PYTHIA8 $PYTHIA8/include \
2739
        /opt/pythia8/include /usr/local/include /usr/include
2739
        /opt/pythia8/include /usr/local/include /usr/include /usr/include/pythia
2740
    pythia8incdir=$found_dir
2740
    pythia8incdir=$found_dir
2741
2741
2742
    check_library "libpythia8" "$enable_shared" "$pythia8libdir" \
2742
    check_library "libpythia8" "$enable_shared" "$pythia8libdir" \
Lines 3077-3083 Link Here
3077
                   libpython python Python" \
3077
                   libpython python Python" \
3078
        "$enable_shared" "$pythonlibdir" $PYTHONDIR/libs $PYTHONDIR/lib \
3078
        "$enable_shared" "$pythonlibdir" $PYTHONDIR/libs $PYTHONDIR/lib \
3079
        $PYTHONDIR $pythonsyslibdir $pythonsyslibdir/config \
3079
        $PYTHONDIR $pythonsyslibdir $pythonsyslibdir/config \
3080
        $pythonsyslibdir2
3080
        $pythonsyslibdir2 /usr/lib
3081
    pythonlib=$found_lib
3081
    pythonlib=$found_lib
3082
    pythonlibdir=$found_dir
3082
    pythonlibdir=$found_dir
3083
3083

Return to bug 280925