|
Lines 4029-4035
Link Here
|
| 4029 |
PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr ) |
4029 |
PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr ) |
| 4030 |
fi |
4030 |
fi |
| 4031 |
|
4031 |
|
| 4032 |
if $PKG_CONFIG --exists libxul ; then |
4032 |
if test "$MOZ_FLAVOUR" != "libxul"; then |
|
|
4033 |
PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" ) |
| 4034 |
MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` |
| 4035 |
MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` |
| 4036 |
fi |
| 4037 |
|
| 4038 |
if test -z "$HASXPCOM"; then |
| 4033 |
PKG_CHECK_MODULES( MOZILLAXPCOM, libxul ) |
4039 |
PKG_CHECK_MODULES( MOZILLAXPCOM, libxul ) |
| 4034 |
MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` |
4040 |
MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` |
| 4035 |
MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul` |
4041 |
MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul` |
|
Lines 4039-4048
Link Here
|
| 4039 |
MOZ_LIB="$MOZ_LIB/sdk/lib" |
4045 |
MOZ_LIB="$MOZ_LIB/sdk/lib" |
| 4040 |
fi |
4046 |
fi |
| 4041 |
fi |
4047 |
fi |
| 4042 |
else |
|
|
| 4043 |
PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom ) |
| 4044 |
MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` |
| 4045 |
MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` |
| 4046 |
fi |
4048 |
fi |
| 4047 |
|
4049 |
|
| 4048 |
save_CPPFLAGS="$CPPFLAGS" |
4050 |
save_CPPFLAGS="$CPPFLAGS" |