diff options
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/configure | 15 | ||||
| -rw-r--r-- | source3/configure.in | 5 |
2 files changed, 7 insertions, 13 deletions
diff --git a/source3/configure b/source3/configure index f640a43885..c851f13ebf 100755 --- a/source3/configure +++ b/source3/configure @@ -12866,7 +12866,7 @@ if test "${with_included_popt+set}" = set; then esac fi -if test x"$INCLUDED_POPT" = x"no"; then +if test x"$INCLUDED_POPT" != x"yes"; then echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6 echo "configure:12872: checking for poptGetContext in -lpopt" >&5 ac_lib_var=`echo popt'_'poptGetContext | sed 'y%./+-%__p_%'` @@ -12902,14 +12902,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo popt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lpopt $LIBS" - + INCLUDED_POPT=no else echo "$ac_t""no" 1>&6 INCLUDED_POPT=yes @@ -12935,11 +12928,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 12939 "configure" +#line 12932 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:12943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else diff --git a/source3/configure.in b/source3/configure.in index 1de15c4333..134b7ec6af 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2491,8 +2491,9 @@ AC_ARG_WITH(included-popt, ;; esac ], ) -if test x"$INCLUDED_POPT" = x"no"; then - AC_CHECK_LIB(popt, poptGetContext, ,INCLUDED_POPT=yes) +if test x"$INCLUDED_POPT" != x"yes"; then + AC_CHECK_LIB(popt, poptGetContext, + INCLUDED_POPT=no, INCLUDED_POPT=yes) fi if test x"$INCLUDED_POPT" = x"yes"; then |