ncurses 5.6 - patch 20080920

[ncurses.git] / configure

diff --git a/configure b/configure
index 44beba004a1ad2b9ccb14c786ae16954c38cdaac..084e60f27d35242d6667199cd47513690f5585e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -17424,6 +17424,11 @@ done
        esac
 cf_prefix=$LIB_PREFIX
 
        esac
 cf_prefix=$LIB_PREFIX
 

+if test $cf_cv_shlib_version = cygdll ; then
+       TINFO_NAME=$TINFO_ARG_SUFFIX
+       TINFO_SUFFIX=.dll
+fi
+

 for cf_dir in $SRC_SUBDIRS
 do
        if test ! -d $srcdir/$cf_dir ; then
 for cf_dir in $SRC_SUBDIRS
 do
        if test ! -d $srcdir/$cf_dir ; then


@@ -17523,7 +17528,8 @@ do
                        # use autodetected ${cf_prefix} for import lib and static lib, but
                        # use 'cyg' prefix for shared lib.
                        if test $cf_cv_shlib_version = cygdll ; then
                        # use autodetected ${cf_prefix} for import lib and static lib, but
                        # use 'cyg' prefix for shared lib.
                        if test $cf_cv_shlib_version = cygdll ; then

-                               LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
+                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                               LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"

                                continue
                        fi
                        fi
                                continue
                        fi
                        fi


@@ -17533,24 +17539,28 @@ do
                if test $cf_dir = ncurses ; then
                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"
                if test $cf_dir = ncurses ; then
                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"

+                       cf_liblist="$LIBS_TO_MAKE"

 
                        while test -n "$cf_r_parts"
                        do
                                cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
 
                        while test -n "$cf_r_parts"
                        do
                                cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then

+                                       cf_item=

                                        case $cf_l_parts in #(vi
                                        *termlib*) #(vi
                                        case $cf_l_parts in #(vi
                                        *termlib*) #(vi

-                                               cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+                                               cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`

                                                ;;
                                        *ticlib*)
                                                ;;
                                        *ticlib*)

-                                               cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+                                               cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`

                                                ;;
                                        *)
                                                break
                                                ;;
                                        esac
                                                ;;
                                        *)
                                                break
                                                ;;
                                        esac

-                                       LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+                                       if test -n "$cf_item"; then
+                                               LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+                                       fi

                                else
                                        break
                                fi
                                else
                                        break
                                fi


@@ -17643,22 +17653,21 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                        if test $cf_dir = ncurses ; then
                                case $cf_subset in
                                *base*)
                        if test $cf_dir = ncurses ; then
                                case $cf_subset in
                                *base*)

+                                       cf_libname=${cf_libname}$LIB_SUFFIX

                                        ;;
                                *termlib*)
                                        cf_libname=$TINFO_LIB_SUFFIX
                                        ;;
                                *termlib*)
                                        cf_libname=$TINFO_LIB_SUFFIX

-                                       if test -n "${DFT_ARG_SUFFIX}" ; then
-                                               # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-                                               cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-                                       fi

                                        ;;
                                ticlib*)
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                ticlib*)
                                        cf_libname=$TICS_LIB_SUFFIX

-                                       if test -n "${DFT_ARG_SUFFIX}" ; then
-                                               # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-                                               cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-                                       fi

                                        ;;
                                esac
                                        ;;
                                esac

+                       else
+                               cf_libname=${cf_libname}$LIB_SUFFIX
+                       fi
+                       if test -n "${DFT_ARG_SUFFIX}" ; then
+                               # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
+                               cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`

                        fi
 
                        # These dependencies really are for development, not
                        fi
 
                        # These dependencies really are for development, not