/[gnustep]/gnustep/core/make/configure
ViewVC logotype

Diff of /gnustep/core/make/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.161 by fedor, Sat Aug 23 03:02:47 2003 UTC revision 1.162 by fedor, Mon Sep 29 16:46:49 2003 UTC
# Line 317  ac_includes_default="\ Line 317  ac_includes_default="\
317  # include <unistd.h>  # include <unistd.h>
318  #endif"  #endif"
319    
320  ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded AUTO_DEPENDENCIES OBJC_NO_IMPORT_FLAGS INCLUDE_FLAGS GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'  ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded AUTO_DEPENDENCIES INCLUDES OBJC_NO_IMPORT_FLAGS GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
321  ac_subst_files=''  ac_subst_files=''
322    
323  # Initialize some variables set by options.  # Initialize some variables set by options.
# Line 2529  if test "$ac_cv_library_combo" = ""; the Line 2529  if test "$ac_cv_library_combo" = ""; the
2529    case "$host_os" in    case "$host_os" in
2530      darwin*)   ac_cv_library_combo=apple-apple-apple ;;      darwin*)   ac_cv_library_combo=apple-apple-apple ;;
2531      nextstep4) ac_cv_library_combo=nx-nx-nx          ;;      nextstep4) ac_cv_library_combo=nx-nx-nx          ;;
2532        openstep4) ac_cv_library_combo=nx-nx-nx          ;;
2533      *)         ac_cv_library_combo=gnu-gnu-gnu       ;;      *)         ac_cv_library_combo=gnu-gnu-gnu       ;;
2534    esac    esac
2535  fi  fi
# Line 2548  OBJC_RUNTIME_LIB=`echo $ac_cv_library_co Line 2549  OBJC_RUNTIME_LIB=`echo $ac_cv_library_co
2549  #--------------------------------------------------------------------  #--------------------------------------------------------------------
2550  # specific target_os options  # specific target_os options
2551  #--------------------------------------------------------------------  #--------------------------------------------------------------------
2552  INCLUDE_FLAGS=  INCLUDES=
2553  case "$target_os" in  case "$target_os" in
2554    freebsd* | openbsd* )    freebsd* | openbsd* )
2555                  INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/local/include"                  INCLUDES="-I/usr/local/include"
2556                  LIBS="$LIBS -L/usr/local/lib";;                  LDFLAGS="$LDFLAGS -L/usr/local/lib";;
2557    netbsd*)      INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/pkg/include"    netbsd*)      INCLUDES="-I/usr/pkg/include"
2558                  LIBS="$LIBS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;                  LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
2559  esac  esac
 # Save the user supplied CPPFLAGS so we can restore them later.  
 user_CPPFLAGS="$CPPFLAGS"  
 # This is just for configuring. Later, in config.make, INCLUDE_FLAGS  
 # goes in CONFIG_SYSTEM_INCL and the original CPPFLAGS goes in unaltered  
 CPPFLAGS="$CPPFLAGS $INCLUDE_FLAGS"  
2560    
2561  #--------------------------------------------------------------------  #--------------------------------------------------------------------
2562  # Determine the host, build, and target systems  # Determine the host, build, and target systems
# Line 3305  echo "${ECHO_T}$gs_cv_objc_libdir" >&6 Line 3301  echo "${ECHO_T}$gs_cv_objc_libdir" >&6
3301  # The following are needed to compile the test programs  # The following are needed to compile the test programs
3302  if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then  if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
3303    if test "$GNUSTEP_FLATTENED" = yes; then    if test "$GNUSTEP_FLATTENED" = yes; then
3304      OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"      OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers"
3305    else    else
3306      OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers/${ac_cv_library_combo}"      OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers/${ac_cv_library_combo}"
3307    fi    fi
3308    OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"    OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
3309  fi  fi
# Line 4099  fi; Line 4095  fi;
4095    
4096  echo "$as_me:$LINENO: checking whether objc has thread support" >&5  echo "$as_me:$LINENO: checking whether objc has thread support" >&5
4097  echo $ECHO_N "checking whether objc has thread support... $ECHO_C" >&6  echo $ECHO_N "checking whether objc has thread support... $ECHO_C" >&6
 extra_LIBS=""  
 case "${target_os}" in  
   solaris*)  
         extra_LIBS="-lposix4"  
         ;;  
 esac  
4098  saved_CFLAGS="$CFLAGS"  saved_CFLAGS="$CFLAGS"
4099  saved_LIBS="$LIBS"  saved_LIBS="$LIBS"
4100  CFLAGS="$CFLAGS -x objective-c -I$srcdir $OBJC_CPPFLAGS $OBJC_LDFLAGS"  CFLAGS="$CFLAGS -x objective-c -I$srcdir $OBJC_CPPFLAGS $OBJC_LDFLAGS"
# Line 4118  if test "$OBJC_RUNTIME_LIB" = "apple"; t Line 4108  if test "$OBJC_RUNTIME_LIB" = "apple"; t
4108    CFLAGS="$CFLAGS -DNeXT_RUNTIME"    CFLAGS="$CFLAGS -DNeXT_RUNTIME"
4109  fi  fi
4110  if test "$OBJC_THREAD" != ""; then  if test "$OBJC_THREAD" != ""; then
4111    LIBS="-lobjc $LIBS $OBJC_THREAD $extra_LIBS"    LIBS="-lobjc $LIBS $OBJC_THREAD"
4112    if test "$cross_compiling" = yes; then    if test "$cross_compiling" = yes; then
4113    objc_threaded=""    objc_threaded=""
4114  else  else
# Line 4142  if { (eval echo "$as_me:$LINENO: \"$ac_l Line 4132  if { (eval echo "$as_me:$LINENO: \"$ac_l
4132    ac_status=$?    ac_status=$?
4133    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
4134    (exit $ac_status); }; }; then    (exit $ac_status); }; }; then
4135    objc_threaded="$OBJC_THREAD $extra_LIBS"    objc_threaded="$OBJC_THREAD"
4136  else  else
4137    echo "$as_me: program exited with status $ac_status" >&5    echo "$as_me: program exited with status $ac_status" >&5
4138  echo "$as_me: failed program was:" >&5  echo "$as_me: failed program was:" >&5
# Line 4301  fi Line 4291  fi
4291    fi    fi
4292  elif test "$MINGW32" = yes; then  elif test "$MINGW32" = yes; then
4293    # Mingw doesn't need anything extra for threads    # Mingw doesn't need anything extra for threads
4294    LIBS="-lobjc $LIBS $extra_LIBS"    LIBS="-lobjc $LIBS"
4295    if test "$cross_compiling" = yes; then    if test "$cross_compiling" = yes; then
4296    objc_threaded="works"    objc_threaded="works"
4297  else  else
# Line 4337  fi Line 4327  fi
4327  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4328  fi  fi
4329  else  else
4330    LIBS="-lobjc $LIBS $extra_LIBS"    LIBS="-lobjc $LIBS"
4331    if test "$cross_compiling" = yes; then    if test "$cross_compiling" = yes; then
4332    objc_threaded=""    objc_threaded=""
4333  else  else
# Line 4373  fi Line 4363  fi
4363  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4364  fi  fi
4365    if test x"$objc_threaded" = x""; then    if test x"$objc_threaded" = x""; then
4366      LIBS="-lobjc $saved_LIBS -lpthread $extra_LIBS"      LIBS="-lobjc $saved_LIBS -lpthread "
4367      if test "$cross_compiling" = yes; then      if test "$cross_compiling" = yes; then
4368    objc_threaded=""    objc_threaded=""
4369  else  else
# Line 4397  if { (eval echo "$as_me:$LINENO: \"$ac_l Line 4387  if { (eval echo "$as_me:$LINENO: \"$ac_l
4387    ac_status=$?    ac_status=$?
4388    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
4389    (exit $ac_status); }; }; then    (exit $ac_status); }; }; then
4390    objc_threaded="-lpthread $extra_LIBS"    objc_threaded="-lpthread"
4391  else  else
4392    echo "$as_me: program exited with status $ac_status" >&5    echo "$as_me: program exited with status $ac_status" >&5
4393  echo "$as_me: failed program was:" >&5  echo "$as_me: failed program was:" >&5
# Line 4410  rm -f core core.* *.core gmon.out bb.out Line 4400  rm -f core core.* *.core gmon.out bb.out
4400  fi  fi
4401    fi    fi
4402    if test x"$objc_threaded" = x""; then    if test x"$objc_threaded" = x""; then
4403      LIBS="-lobjc $saved_LIBS -lthread $extra_LIBS"      # Solaris, OpenBSD/sparc
4404        LIBS="-lobjc $saved_LIBS -lpthread -lposix4"
4405      if test "$cross_compiling" = yes; then      if test "$cross_compiling" = yes; then
4406    objc_threaded=""    objc_threaded=""
4407  else  else
# Line 4434  if { (eval echo "$as_me:$LINENO: \"$ac_l Line 4425  if { (eval echo "$as_me:$LINENO: \"$ac_l
4425    ac_status=$?    ac_status=$?
4426    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
4427    (exit $ac_status); }; }; then    (exit $ac_status); }; }; then
4428    objc_threaded="-lthread $extra_LIBS"    objc_threaded="-lpthread -lposix4"
4429    else
4430      echo "$as_me: program exited with status $ac_status" >&5
4431    echo "$as_me: failed program was:" >&5
4432    sed 's/^/| /' conftest.$ac_ext >&5
4433    
4434    ( exit $ac_status )
4435    objc_threaded=""
4436    fi
4437    rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4438    fi
4439      fi
4440      if test x"$objc_threaded" = x""; then
4441        LIBS="-lobjc $saved_LIBS -lthread "
4442        if test "$cross_compiling" = yes; then
4443      objc_threaded=""
4444    else
4445      cat >conftest.$ac_ext <<_ACEOF
4446    #line $LINENO "configure"
4447    /* confdefs.h.  */
4448    _ACEOF
4449    cat confdefs.h >>conftest.$ac_ext
4450    cat >>conftest.$ac_ext <<_ACEOF
4451    /* end confdefs.h.  */
4452    #include "config_thread.m"
4453    _ACEOF
4454    rm -f conftest$ac_exeext
4455    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4456      (eval $ac_link) 2>&5
4457      ac_status=$?
4458      echo "$as_me:$LINENO: \$? = $ac_status" >&5
4459      (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4460      { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4461      (eval $ac_try) 2>&5
4462      ac_status=$?
4463      echo "$as_me:$LINENO: \$? = $ac_status" >&5
4464      (exit $ac_status); }; }; then
4465      objc_threaded="-lthread"
4466  else  else
4467    echo "$as_me: program exited with status $ac_status" >&5    echo "$as_me: program exited with status $ac_status" >&5
4468  echo "$as_me: failed program was:" >&5  echo "$as_me: failed program was:" >&5
# Line 4454  if test x"$objc_threaded" = x""; then Line 4482  if test x"$objc_threaded" = x""; then
4482  echo "${ECHO_T}no" >&6  echo "${ECHO_T}no" >&6
4483  else  else
4484    if test x"$objc_threaded" = x"works"; then    if test x"$objc_threaded" = x"works"; then
4485      objc_threaded="$extra_LIBS"      objc_threaded=""
4486    fi    fi
4487    echo "$as_me:$LINENO: result: yes: $objc_threaded" >&5    echo "$as_me:$LINENO: result: yes: $objc_threaded" >&5
4488  echo "${ECHO_T}yes: $objc_threaded" >&6  echo "${ECHO_T}yes: $objc_threaded" >&6
# Line 4501  fi Line 4529  fi
4529    
4530    
4531    
4532    
4533  #---------------------------------------------------------------------  #---------------------------------------------------------------------
4534  # Enable/disable warnings for deprecated #import directive as required  # Enable/disable warnings for deprecated #import directive as required
4535  #---------------------------------------------------------------------  #---------------------------------------------------------------------
# Line 4527  if test "$ac_cv_import" = "yes"; then Line 4556  if test "$ac_cv_import" = "yes"; then
4556  fi  fi
4557    
4558    
 CPPFLAGS="$user_CPPFLAGS"  
   
   
4559  #--------------------------------------------------------------------  #--------------------------------------------------------------------
4560  # Disable updating the obsolete directory structure  # Disable updating the obsolete directory structure
4561  #--------------------------------------------------------------------  #--------------------------------------------------------------------
# Line 5267  s,@EGREP@,$EGREP,;t t Line 5293  s,@EGREP@,$EGREP,;t t
5293  s,@objc_threaded@,$objc_threaded,;t t  s,@objc_threaded@,$objc_threaded,;t t
5294  s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t  s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t
5295  s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t  s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t
5296    s,@INCLUDES@,$INCLUDES,;t t
5297  s,@OBJC_NO_IMPORT_FLAGS@,$OBJC_NO_IMPORT_FLAGS,;t t  s,@OBJC_NO_IMPORT_FLAGS@,$OBJC_NO_IMPORT_FLAGS,;t t
 s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t  
5298  s,@GNUSTEP_MOVE_OBSOLETE@,$GNUSTEP_MOVE_OBSOLETE,;t t  s,@GNUSTEP_MOVE_OBSOLETE@,$GNUSTEP_MOVE_OBSOLETE,;t t
5299  s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t  s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
5300  s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t  s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t

Legend:
Removed from v.1.161  
changed lines
  Added in v.1.162

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26