| 1 |
jer 11/11/18 04:34:54 |
| 2 |
|
| 3 |
Added: nb-0.8.3-configure.patch |
| 4 |
Log: |
| 5 |
Respect CFLAGS/LDFLAGS. Fix underlinking issue by using pkg-config to obtain a list of libraries (bug #371893). Build nbTutorial.info without including fdl.texi. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/nb/files/nb-0.8.3-configure.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nb/files/nb-0.8.3-configure.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nb/files/nb-0.8.3-configure.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nb-0.8.3-configure.patch |
| 16 |
=================================================================== |
| 17 |
1) Use pkg-config to figure out openssl libraries (also fixes underlinking with |
| 18 |
ld.gold, bug #371893). |
| 19 |
2) Respect CFLAGS/LDFLAGS. |
| 20 |
|
| 21 |
-jer |
| 22 |
|
| 23 |
|
| 24 |
--- a/lib/configure.ac |
| 25 |
+++ b/lib/configure.ac |
| 26 |
@@ -113,7 +113,7 @@ |
| 27 |
AC_CHECK_LIB([pcre],[pcre_compile],,[AC_MSG_ERROR(Required library -lpcre not found. You may want to download it from http://www.pcre.org or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) |
| 28 |
AC_CHECK_LIB([readline],[readline],,[AC_MSG_ERROR(Required library -lreadline not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) |
| 29 |
AC_CHECK_LIB(history,add_history,,[AC_MSG_ERROR(Required library -lhistory not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) |
| 30 |
-AC_CHECK_LIB(ssl,SSL_library_init,,[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) |
| 31 |
+PKG_CHECK_MODULES(libssl,openssl,LIBS="$LIBS `$PKG_CONFIG --cflags --libs openssl`",[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) |
| 32 |
|
| 33 |
AC_SEARCH_LIBS(socket,socket) |
| 34 |
AC_SEARCH_LIBS(inet_ntoa,nsl) |
| 35 |
@@ -152,8 +152,6 @@ |
| 36 |
# define a release date variable |
| 37 |
AC_DEFINE_UNQUOTED(NB_COMPILE_PLATFORM,"$host",[Define compile platform]) |
| 38 |
|
| 39 |
-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include" |
| 40 |
-LDFLAGS="-L/usr/local/ssl/lib" |
| 41 |
case "$host" in |
| 42 |
*-netbsd*) |
| 43 |
AC_DEFINE(NETBSD,,[Define if NetBSD]) |
| 44 |
--- a/module/configure.ac |
| 45 |
+++ b/module/configure.ac |
| 46 |
@@ -100,8 +100,6 @@ |
| 47 |
|
| 48 |
AC_SUBST([NB_MOD_PATH],[../.libs]) |
| 49 |
|
| 50 |
-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include" |
| 51 |
-LDFLAGS="-L/usr/local/ssl/lib" |
| 52 |
|
| 53 |
#===================================== |
| 54 |
# Checks for header files. |
| 55 |
--- a/module/webster/configure.ac |
| 56 |
+++ b/module/webster/configure.ac |
| 57 |
@@ -87,8 +87,6 @@ |
| 58 |
# AC_PATH_PROGS([NB],[nb-0.7.5 nb-0.7.4 nb-0.7.3 nb-0.7.2 nb-0.7.1 nb]) |
| 59 |
#fi |
| 60 |
|
| 61 |
-CFLAGS="-I/usr/local/include -I/usr/local/ssl/include" |
| 62 |
-LDFLAGS="-L/usr/local/ssl/lib" |
| 63 |
|
| 64 |
#===================================== |
| 65 |
# Checks for libraries. |
Archives