Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 209589
Collapse All | Expand All

(-)src/Makefile.am (-2 / +2 lines)
Lines 4-11 Link Here
4
	     Makefile.win \
4
	     Makefile.win \
5
	     ntgetpin.rc
5
	     ntgetpin.rc
6
6
7
lib_LTLIBRARIES = libsvrcore.la
7
pkglib_LTLIBRARIES = libsvrcore.la
8
include_HEADERS = svrcore.h
8
pkginclude_HEADERS = svrcore.h
9
libsvrcore_la_SOURCES =	alt.c \
9
libsvrcore_la_SOURCES =	alt.c \
10
		      	cache.c \
10
		      	cache.c \
11
		      	errors.c \
11
		      	errors.c \
(-)svrcore.pc.in (-3 / +3 lines)
Lines 1-11 Link Here
1
prefix=@prefix@
1
prefix=@prefix@
2
exec_prefix=@exec_prefix@
2
exec_prefix=@exec_prefix@
3
libdir=@libdir@
3
libdir=@libdir@/@PACKAGE@
4
includedir=@includedir@
4
includedir=@includedir@/@PACKAGE@
5
5
6
Name: svrcore
6
Name: svrcore
7
Description: Svrcore - Secure PIN handling using NSS crypto
7
Description: Svrcore - Secure PIN handling using NSS crypto
8
Version: @VERSION@
8
Version: @VERSION@
9
Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
9
Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
10
Libs: -lsvrcore
10
Libs: -L${libdir} -lsvrcore
11
Cflags: -I${includedir}
11
Cflags: -I${includedir}
(-)m4.orig/nspr.m4 (-22 lines)
Lines 52-79 Link Here
52
],
52
],
53
AC_MSG_RESULT(no))
53
AC_MSG_RESULT(no))
54
54
55
# see if we are doing an "in-tree" build with the other
56
# mozilla components
57
if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
58
    for nsprpath in "../../dist" "../../dist/*.OBJ" ; do
59
        savedir=`pwd`
60
        cd $nsprpath
61
        abs_nsprpath=`pwd`
62
        cd $savedir
63
        if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
64
            nspr_inc="-I$abs_nsprpath/include/nspr"
65
        elif test -f "$abs_nsprpath/include/nspr.h" ; then
66
            nspr_inc="-I$abs_nsprpath/include"
67
        fi
68
        if test -d "$abs_nsprpath/lib" ; then
69
            nspr_lib="-L$abs_nsprpath/lib"
70
        fi
71
        if test -n "$nspr_inc" -a -n "$nspr_lib" ; then
72
            break
73
        fi
74
    done
75
fi
76
77
# if NSPR is not found yet, try pkg-config
55
# if NSPR is not found yet, try pkg-config
78
# last resort
56
# last resort
79
if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
57
if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
(-)m4.orig/nss.m4 (-26 lines)
Lines 52-83 Link Here
52
],
52
],
53
AC_MSG_RESULT(no))
53
AC_MSG_RESULT(no))
54
54
55
# see if we are building "in tree" with the
56
# other mozilla components
57
if test -z "$nss_inc" -o -z "$nss_lib"; then
58
    nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '`
59
    savedir=`pwd`
60
    cd $nsslibpath
61
    abs_nsslibpath=`pwd`
62
    cd $savedir
63
    nssincpath=../../dist/public/nss
64
    savedir=`pwd`
65
    cd $nssincpath
66
    abs_nssincpath=`pwd`
67
    cd $savedir
68
    if test -f "$abs_nssincpath/nss.h" ; then
69
        nss_inc="-I$abs_nssincpath"
70
    fi
71
    if test -d "$abs_nsslibpath" ; then
72
        nss_lib="-L$abs_nsslibpath"
73
    fi
74
    if test -n "$nss_inc" -a -n "$nss_lib" ; then
75
        AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath)
76
    else
77
        AC_MSG_CHECKING(could not find in-tree NSS in ../../dist)
78
    fi
79
fi
80
81
# if NSS is not found yet, try pkg-config
55
# if NSS is not found yet, try pkg-config
82
# last resort
56
# last resort
83
if test -z "$nss_inc" -o -z "$nss_lib"; then
57
if test -z "$nss_inc" -o -z "$nss_lib"; then

Return to bug 209589