projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
42eee1a
)
Fixed configure.
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 9 Nov 1998 13:39:45 +0000
(13:39 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 9 Nov 1998 13:39:45 +0000
(13:39 +0000)
configure
patch
|
blob
|
history
configure.in
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
47e676a
..
662f93c
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-866,32
+866,34
@@
fi
if test "${with_yc+set}" = set; then
withval="$with_yc"
YCDIR=$withval
if test "${with_yc+set}" = set; then
withval="$with_yc"
YCDIR=$withval
+else
+ YCDIR=""
fi
if test "$YCDIR" = "yes"; then
YCDIR="../yc"
fi
fi
if test "$YCDIR" = "yes"; then
YCDIR="../yc"
fi
-if test -L z39.50; then
+if test -d z39.50; then
rm z39.50
fi
rm z39.50
fi
-if test ! -d "$YCDIR"; then
- echo "configure: warning: YC directory ${YCDIR} doesn't exist" 1>&2
-fi
if test "$YCDIR" = ""; then
ASNMODULE=asn
else
if test "$YCDIR" = ""; then
ASNMODULE=asn
else
+ if test ! -d "$YCDIR"; then
+ echo "configure: warning: YC directory ${YCDIR} doesn't exist" 1>&2
+ fi
ln -s ${YCDIR}/z39.50 z39.50
ASNMODULE=z39.50
fi
checkBoth=0
echo $ac_n "checking for connect""... $ac_c" 1>&6
ln -s ${YCDIR}/z39.50 z39.50
ASNMODULE=z39.50
fi
checkBoth=0
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:890: checking for connect" >&5
+echo "configure:892: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 895 "configure"
+#line 897 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@
-914,7
+916,7
@@
connect();
; return 0; }
EOF
; return 0; }
EOF
-if { (eval echo configure:918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@
-935,7
+937,7
@@
fi
if test "$ac_cv_func_connect" = "no"; then
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
if test "$ac_cv_func_connect" = "no"; then
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:939: checking for main in -lsocket" >&5
+echo "configure:941: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@
-943,14
+945,14
@@
else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 947 "configure"
+#line 949 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@
-976,12
+978,12
@@
if test "$checkBoth" = "1"; then
oldLibs=$LIBS
LIBS="$LIBS -lsocket -lnsl"
echo $ac_n "checking for accept""... $ac_c" 1>&6
oldLibs=$LIBS
LIBS="$LIBS -lsocket -lnsl"
echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:980: checking for accept" >&5
+echo "configure:982: checking for accept" >&5
if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 985 "configure"
+#line 987 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char accept(); below. */
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char accept(); below. */
@@
-1004,7
+1006,7
@@
accept();
; return 0; }
EOF
; return 0; }
EOF
-if { (eval echo configure:1008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_accept=yes"
else
rm -rf conftest*
eval "ac_cv_func_accept=yes"
else
@@
-1026,12
+1028,12
@@
fi
fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1030: checking for gethostbyname" >&5
+echo "configure:1032: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1035 "configure"
+#line 1037 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@
-1054,7
+1056,7
@@
gethostbyname();
; return 0; }
EOF
; return 0; }
EOF
-if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@
-1072,7
+1074,7
@@
if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:1076: checking for main in -lnsl" >&5
+echo "configure:1078: checking for main in -lnsl" >&5
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@
-1080,14
+1082,14
@@
else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1084 "configure"
+#line 1086 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@
-1110,12
+1112,12
@@
fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1114: checking for ANSI C header files" >&5
+echo "configure:1116: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1121 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@
-1123,7
+1125,7
@@
else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@
-1140,7
+1142,7
@@
rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1144 "configure"
+#line 1146 "configure"
#include "confdefs.h"
#include <string.h>
EOF
#include "confdefs.h"
#include <string.h>
EOF
@@
-1158,7
+1160,7
@@
fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1162 "configure"
+#line 1164 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
#include "confdefs.h"
#include <stdlib.h>
EOF
@@
-1179,7
+1181,7
@@
if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 1183 "configure"
+#line 1185 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@
-1190,7
+1192,7
@@
if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
exit (0); }
EOF
-if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
then
:
else
@@
-1229,17
+1231,17
@@
if test "$threads_ok" = "yes"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1233: checking for $ac_hdr" >&5
+echo "configure:1235: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1238 "configure"
+#line 1240 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@
-1266,12
+1268,12
@@
fi
done
echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
done
echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
-echo "configure:1270: checking for pthread_mutex_lock" >&5
+echo "configure:1272: checking for pthread_mutex_lock" >&5
if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1275 "configure"
+#line 1277 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_mutex_lock(); below. */
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_mutex_lock(); below. */
@@
-1294,7
+1296,7
@@
pthread_mutex_lock();
; return 0; }
EOF
; return 0; }
EOF
-if { (eval echo configure:1298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_pthread_mutex_lock=yes"
else
rm -rf conftest*
eval "ac_cv_func_pthread_mutex_lock=yes"
else
@@
-1315,7
+1317,7
@@
fi
if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:1319: checking for main in -lpthread" >&5
+echo "configure:1321: checking for main in -lpthread" >&5
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@
-1323,14
+1325,14
@@
else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1329 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git
a/configure.in
b/configure.in
index
e5b33d5
..
c9d3385
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,7
+1,7
@@
dnl YAZ Toolkit
dnl (c) Index Data 1994-1998
dnl See the file LICENSE for details.
dnl YAZ Toolkit
dnl (c) Index Data 1994-1998
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.4 1998-11-09 13:23:09 adam Exp $
+dnl $Id: configure.in,v 1.5 1998-11-09 13:39:46 adam Exp $
AC_INIT(include/yaz-version.h)
dnl
dnl ------ Checking programs
AC_INIT(include/yaz-version.h)
dnl
dnl ------ Checking programs
@@
-12,20
+12,20
@@
AC_PROG_RANLIB
dnl
dnl ----- YC: The Yaz Compiler
AC_SUBST(ASNMODULE)
dnl
dnl ----- YC: The Yaz Compiler
AC_SUBST(ASNMODULE)
-AC_ARG_WITH(yc,[ --with-yc compile using YC: The Yaz Compiler], [YCDIR=$withval])
+AC_ARG_WITH(yc,[ --with-yc compile using YC: The Yaz Compiler], [YCDIR=$withval],[YCDIR=""])
if test "$YCDIR" = "yes"; then
YCDIR="../yc"
fi
if test "$YCDIR" = "yes"; then
YCDIR="../yc"
fi
-if test -L z39.50; then
+if test -d z39.50; then
rm z39.50
fi
rm z39.50
fi
-if test ! -d "$YCDIR"; then
- AC_MSG_WARN(YC directory ${YCDIR} doesn't exist)
-fi
if test "$YCDIR" = ""; then
ASNMODULE=asn
else
if test "$YCDIR" = ""; then
ASNMODULE=asn
else
+ if test ! -d "$YCDIR"; then
+ AC_MSG_WARN(YC directory ${YCDIR} doesn't exist)
+ fi
ln -s ${YCDIR}/z39.50 z39.50
ASNMODULE=z39.50
fi
ln -s ${YCDIR}/z39.50 z39.50
ASNMODULE=z39.50
fi