Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a27fafe

Browse files
committed
Ordering of libraries changed so that -lbsd is *after* -lm
Fixes a problem Darren reports with AIX, and doesn't seem to break either FreeBSD or Linux(David?)...
1 parent ff038a5 commit a27fafe

File tree

2 files changed

+61
-61
lines changed

2 files changed

+61
-61
lines changed

src/configure

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,14 +1800,14 @@ else
18001800
echo "$ac_t""no" 1>&6
18011801
fi
18021802

1803-
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
1804-
echo "configure:1805: checking for main in -lm" >&5
1805-
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
1803+
echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
1804+
echo "configure:1805: checking for main in -lbsd" >&5
1805+
ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
18061806
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18071807
echo $ac_n "(cached) $ac_c" 1>&6
18081808
else
18091809
ac_save_LIBS="$LIBS"
1810-
LIBS="-lm $LIBS"
1810+
LIBS="-lbsd $LIBS"
18111811
cat > conftest.$ac_ext <<EOF
18121812
#line 1813 "configure"
18131813
#include "confdefs.h"
@@ -1831,26 +1831,26 @@ LIBS="$ac_save_LIBS"
18311831
fi
18321832
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
18331833
echo "$ac_t""yes" 1>&6
1834-
ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1834+
ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
18351835
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
18361836
cat >> confdefs.h <<EOF
18371837
#define $ac_tr_lib 1
18381838
EOF
18391839

1840-
LIBS="-lm $LIBS"
1840+
LIBS="-lbsd $LIBS"
18411841

18421842
else
18431843
echo "$ac_t""no" 1>&6
18441844
fi
18451845

1846-
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
1847-
echo "configure:1848: checking for main in -ldl" >&5
1848-
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
1846+
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
1847+
echo "configure:1848: checking for main in -lm" >&5
1848+
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
18491849
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18501850
echo $ac_n "(cached) $ac_c" 1>&6
18511851
else
18521852
ac_save_LIBS="$LIBS"
1853-
LIBS="-ldl $LIBS"
1853+
LIBS="-lm $LIBS"
18541854
cat > conftest.$ac_ext <<EOF
18551855
#line 1856 "configure"
18561856
#include "confdefs.h"
@@ -1874,26 +1874,26 @@ LIBS="$ac_save_LIBS"
18741874
fi
18751875
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
18761876
echo "$ac_t""yes" 1>&6
1877-
ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1877+
ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
18781878
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
18791879
cat >> confdefs.h <<EOF
18801880
#define $ac_tr_lib 1
18811881
EOF
18821882

1883-
LIBS="-ldl $LIBS"
1883+
LIBS="-lm $LIBS"
18841884

18851885
else
18861886
echo "$ac_t""no" 1>&6
18871887
fi
18881888

1889-
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
1890-
echo "configure:1891: checking for main in -lsocket" >&5
1891-
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
1889+
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
1890+
echo "configure:1891: checking for main in -ldl" >&5
1891+
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
18921892
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
18931893
echo $ac_n "(cached) $ac_c" 1>&6
18941894
else
18951895
ac_save_LIBS="$LIBS"
1896-
LIBS="-lsocket $LIBS"
1896+
LIBS="-ldl $LIBS"
18971897
cat > conftest.$ac_ext <<EOF
18981898
#line 1899 "configure"
18991899
#include "confdefs.h"
@@ -1917,26 +1917,26 @@ LIBS="$ac_save_LIBS"
19171917
fi
19181918
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19191919
echo "$ac_t""yes" 1>&6
1920-
ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1920+
ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
19211921
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
19221922
cat >> confdefs.h <<EOF
19231923
#define $ac_tr_lib 1
19241924
EOF
19251925

1926-
LIBS="-lsocket $LIBS"
1926+
LIBS="-ldl $LIBS"
19271927

19281928
else
19291929
echo "$ac_t""no" 1>&6
19301930
fi
19311931

1932-
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
1933-
echo "configure:1934: checking for main in -lnsl" >&5
1934-
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
1932+
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
1933+
echo "configure:1934: checking for main in -lsocket" >&5
1934+
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
19351935
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19361936
echo $ac_n "(cached) $ac_c" 1>&6
19371937
else
19381938
ac_save_LIBS="$LIBS"
1939-
LIBS="-lnsl $LIBS"
1939+
LIBS="-lsocket $LIBS"
19401940
cat > conftest.$ac_ext <<EOF
19411941
#line 1942 "configure"
19421942
#include "confdefs.h"
@@ -1960,26 +1960,26 @@ LIBS="$ac_save_LIBS"
19601960
fi
19611961
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19621962
echo "$ac_t""yes" 1>&6
1963-
ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1963+
ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
19641964
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
19651965
cat >> confdefs.h <<EOF
19661966
#define $ac_tr_lib 1
19671967
EOF
19681968

1969-
LIBS="-lnsl $LIBS"
1969+
LIBS="-lsocket $LIBS"
19701970

19711971
else
19721972
echo "$ac_t""no" 1>&6
19731973
fi
19741974

1975-
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
1976-
echo "configure:1977: checking for main in -lipc" >&5
1977-
ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'`
1975+
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
1976+
echo "configure:1977: checking for main in -lnsl" >&5
1977+
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
19781978
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19791979
echo $ac_n "(cached) $ac_c" 1>&6
19801980
else
19811981
ac_save_LIBS="$LIBS"
1982-
LIBS="-lipc $LIBS"
1982+
LIBS="-lnsl $LIBS"
19831983
cat > conftest.$ac_ext <<EOF
19841984
#line 1985 "configure"
19851985
#include "confdefs.h"
@@ -2003,26 +2003,26 @@ LIBS="$ac_save_LIBS"
20032003
fi
20042004
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20052005
echo "$ac_t""yes" 1>&6
2006-
ac_tr_lib=HAVE_LIB`echo ipc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2006+
ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
20072007
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
20082008
cat >> confdefs.h <<EOF
20092009
#define $ac_tr_lib 1
20102010
EOF
20112011

2012-
LIBS="-lipc $LIBS"
2012+
LIBS="-lnsl $LIBS"
20132013

20142014
else
20152015
echo "$ac_t""no" 1>&6
20162016
fi
20172017

2018-
echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6
2019-
echo "configure:2020: checking for main in -lIPC" >&5
2020-
ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'`
2018+
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
2019+
echo "configure:2020: checking for main in -lipc" >&5
2020+
ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'`
20212021
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20222022
echo $ac_n "(cached) $ac_c" 1>&6
20232023
else
20242024
ac_save_LIBS="$LIBS"
2025-
LIBS="-lIPC $LIBS"
2025+
LIBS="-lipc $LIBS"
20262026
cat > conftest.$ac_ext <<EOF
20272027
#line 2028 "configure"
20282028
#include "confdefs.h"
@@ -2046,26 +2046,26 @@ LIBS="$ac_save_LIBS"
20462046
fi
20472047
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20482048
echo "$ac_t""yes" 1>&6
2049-
ac_tr_lib=HAVE_LIB`echo IPC | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2049+
ac_tr_lib=HAVE_LIB`echo ipc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
20502050
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
20512051
cat >> confdefs.h <<EOF
20522052
#define $ac_tr_lib 1
20532053
EOF
20542054

2055-
LIBS="-lIPC $LIBS"
2055+
LIBS="-lipc $LIBS"
20562056

20572057
else
20582058
echo "$ac_t""no" 1>&6
20592059
fi
20602060

2061-
echo $ac_n "checking for main in -llc""... $ac_c" 1>&6
2062-
echo "configure:2063: checking for main in -llc" >&5
2063-
ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'`
2061+
echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6
2062+
echo "configure:2063: checking for main in -lIPC" >&5
2063+
ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'`
20642064
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20652065
echo $ac_n "(cached) $ac_c" 1>&6
20662066
else
20672067
ac_save_LIBS="$LIBS"
2068-
LIBS="-llc $LIBS"
2068+
LIBS="-lIPC $LIBS"
20692069
cat > conftest.$ac_ext <<EOF
20702070
#line 2071 "configure"
20712071
#include "confdefs.h"
@@ -2089,26 +2089,26 @@ LIBS="$ac_save_LIBS"
20892089
fi
20902090
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20912091
echo "$ac_t""yes" 1>&6
2092-
ac_tr_lib=HAVE_LIB`echo lc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2092+
ac_tr_lib=HAVE_LIB`echo IPC | sed -e 's/[^a-zA-Z0-9_]/_/g' \
20932093
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
20942094
cat >> confdefs.h <<EOF
20952095
#define $ac_tr_lib 1
20962096
EOF
20972097

2098-
LIBS="-llc $LIBS"
2098+
LIBS="-lIPC $LIBS"
20992099

21002100
else
21012101
echo "$ac_t""no" 1>&6
21022102
fi
21032103

2104-
echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6
2105-
echo "configure:2106: checking for main in -ldld" >&5
2106-
ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'`
2104+
echo $ac_n "checking for main in -llc""... $ac_c" 1>&6
2105+
echo "configure:2106: checking for main in -llc" >&5
2106+
ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'`
21072107
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21082108
echo $ac_n "(cached) $ac_c" 1>&6
21092109
else
21102110
ac_save_LIBS="$LIBS"
2111-
LIBS="-ldld $LIBS"
2111+
LIBS="-llc $LIBS"
21122112
cat > conftest.$ac_ext <<EOF
21132113
#line 2114 "configure"
21142114
#include "confdefs.h"
@@ -2132,26 +2132,26 @@ LIBS="$ac_save_LIBS"
21322132
fi
21332133
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21342134
echo "$ac_t""yes" 1>&6
2135-
ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2135+
ac_tr_lib=HAVE_LIB`echo lc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
21362136
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
21372137
cat >> confdefs.h <<EOF
21382138
#define $ac_tr_lib 1
21392139
EOF
21402140

2141-
LIBS="-ldld $LIBS"
2141+
LIBS="-llc $LIBS"
21422142

21432143
else
21442144
echo "$ac_t""no" 1>&6
21452145
fi
21462146

2147-
echo $ac_n "checking for main in -lln""... $ac_c" 1>&6
2148-
echo "configure:2149: checking for main in -lln" >&5
2149-
ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'`
2147+
echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6
2148+
echo "configure:2149: checking for main in -ldld" >&5
2149+
ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'`
21502150
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21512151
echo $ac_n "(cached) $ac_c" 1>&6
21522152
else
21532153
ac_save_LIBS="$LIBS"
2154-
LIBS="-lln $LIBS"
2154+
LIBS="-ldld $LIBS"
21552155
cat > conftest.$ac_ext <<EOF
21562156
#line 2157 "configure"
21572157
#include "confdefs.h"
@@ -2175,26 +2175,26 @@ LIBS="$ac_save_LIBS"
21752175
fi
21762176
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21772177
echo "$ac_t""yes" 1>&6
2178-
ac_tr_lib=HAVE_LIB`echo ln | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2178+
ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
21792179
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
21802180
cat >> confdefs.h <<EOF
21812181
#define $ac_tr_lib 1
21822182
EOF
21832183

2184-
LIBS="-lln $LIBS"
2184+
LIBS="-ldld $LIBS"
21852185

21862186
else
21872187
echo "$ac_t""no" 1>&6
21882188
fi
21892189

2190-
echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
2191-
echo "configure:2192: checking for main in -lbsd" >&5
2192-
ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
2190+
echo $ac_n "checking for main in -lln""... $ac_c" 1>&6
2191+
echo "configure:2192: checking for main in -lln" >&5
2192+
ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'`
21932193
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21942194
echo $ac_n "(cached) $ac_c" 1>&6
21952195
else
21962196
ac_save_LIBS="$LIBS"
2197-
LIBS="-lbsd $LIBS"
2197+
LIBS="-lln $LIBS"
21982198
cat > conftest.$ac_ext <<EOF
21992199
#line 2200 "configure"
22002200
#include "confdefs.h"
@@ -2218,13 +2218,13 @@ LIBS="$ac_save_LIBS"
22182218
fi
22192219
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22202220
echo "$ac_t""yes" 1>&6
2221-
ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2221+
ac_tr_lib=HAVE_LIB`echo ln | sed -e 's/[^a-zA-Z0-9_]/_/g' \
22222222
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
22232223
cat >> confdefs.h <<EOF
22242224
#define $ac_tr_lib 1
22252225
EOF
22262226

2227-
LIBS="-lbsd $LIBS"
2227+
LIBS="-lln $LIBS"
22282228

22292229
else
22302230
echo "$ac_t""no" 1>&6

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ AC_CHECK_LIB(termcap, main)
341341
AC_CHECK_LIB(history, main)
342342
AC_CHECK_LIB(readline, main)
343343
AC_CHECK_LIB(readline, write_history, AC_DEFINE(HAVE_HISTORY))
344+
AC_CHECK_LIB(bsd, main)
344345
AC_CHECK_LIB(m, main)
345346
AC_CHECK_LIB(dl, main)
346347
AC_CHECK_LIB(socket, main)
@@ -350,7 +351,6 @@ AC_CHECK_LIB(IPC, main)
350351
AC_CHECK_LIB(lc, main)
351352
AC_CHECK_LIB(dld, main)
352353
AC_CHECK_LIB(ln, main)
353-
AC_CHECK_LIB(bsd, main)
354354
AC_CHECK_LIB(ld, main)
355355
AC_CHECK_LIB(compat, main)
356356
AC_CHECK_LIB(BSD, main)

0 commit comments

Comments
 (0)