mirror of
https://git.freebsd.org/ports.git
synced 2025-06-23 05:30:31 -04:00
48 lines
2 KiB
Text
48 lines
2 KiB
Text
--- configure.orig Mon Nov 3 11:20:29 2003
|
|
+++ configure Thu Feb 17 10:04:29 2005
|
|
@@ -1228,7 +1228,7 @@
|
|
# Set up default make subdirectory and install file lists.
|
|
SUBDIRS="lib/hpojip lib/ptal lib/sane mlcd apps/cmdline"
|
|
bindir_program="apps/cmdline/ptal-connect apps/cmdline/ptal-device apps/cmdline/ptal-devid apps/cmdline/ptal-pml apps/cmdline/ptal-hp apps/cmdline/hpojip-test"
|
|
-sbindir_program="mlcd/ptal-mlcd apps/cmdline/ptal-printd apps/cmdline/ptal-photod scripts/ptal-init scripts/ptal-cups"
|
|
+sbindir_program="mlcd/ptal-mlcd apps/cmdline/ptal-printd apps/cmdline/ptal-photod"
|
|
includedir_data="include/hpojip.h include/ptal.h"
|
|
|
|
# Select compilers and utilities.
|
|
@@ -2958,15 +2958,15 @@
|
|
echo "${ECHO_T}$dir" >&6
|
|
|
|
for lflagDir in "" "-L$dir/../lib" "-L$dir/../../lib" ; do
|
|
- for lflagCrypto in "" "-lcrypto" ; do
|
|
+ for lflagCrypto in "" "-lcrypto" "-lcrypto -ldes" ; do
|
|
unset ac_cv_lib_snmp_snmp_open
|
|
- echo "$as_me:$LINENO: checking for snmp_open in -lsnmp" >&5
|
|
-echo $ECHO_N "checking for snmp_open in -lsnmp... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for snmp_open in -lnetsnmp" >&5
|
|
+echo $ECHO_N "checking for snmp_open in -lnetsnmp... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_snmp_snmp_open+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lsnmp $lflagDir $lflagCrypto $LIBS"
|
|
+LIBS="-lnetsnmp $lflagDir $lflagCrypto $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -3018,7 +3018,7 @@
|
|
if test $ac_cv_lib_snmp_snmp_open = yes; then
|
|
DEFINES_CMDLINE="$DEFINES_CMDLINE -DHAVE_SNMP"
|
|
INCLUDE_PATH=$INCLUDE_PATH:$dir
|
|
- LIBSNMP_CMDLINE="$lflagDir -lsnmp $lflagCrypto"
|
|
+ LIBSNMP_CMDLINE="$lflagDir -lnetsnmp $lflagCrypto"
|
|
break 2
|
|
|
|
fi
|
|
@@ -3293,7 +3293,6 @@
|
|
if test -n "$QT_MOC" -a -n "$QT_INCLUDE_PATH" -a -n "$LIBQT_CMDLINE" ; then
|
|
QT_PATH=$dir
|
|
SUBDIRS="$SUBDIRS apps/xojpanel"
|
|
- bindir_program="$bindir_program apps/xojpanel/xojpanel"
|
|
INCLUDE_PATH=$INCLUDE_PATH:$QT_INCLUDE_PATH
|
|
LIBRARY_PATH=$LIBRARY_PATH:$QT_PATH/lib
|
|
break
|