gftp-gtk1_check.patch

   1 diff -aurN gftp-2.0.18.orig/configure.in gftp-2.0.18/configure.in
   2 --- gftp-2.0.18.orig/configure.in       2005-02-04 16:42:32.000000000 +0100
   3 +++ gftp-2.0.18/configure.in    2005-04-30 19:02:22.000000000 +0200
   4 @@ -79,10 +79,6 @@
   5    found_glib20=0;
   6  fi
   7
   8 -if test "x$GFTP_TEXT" = "x" -a $found_glib20 = 0 ; then
   9 -  AM_PATH_GLIB(1.2.3, , AC_MSG_ERROR(gFTP needs GLIB 1.2.3 or higher))
  10 -fi
  11 -
  12  EXTRA_LIBS=""
  13
  14  # FreeBSD needs this
  15 @@ -191,27 +187,8 @@
  16  GTHREAD_LIBS=""
  17
  18  if test "x$enable_gtkport" = "xyes" ; then
  19 -  if test $found_glib20 = 1 -a "x$enable_gtk20" = "xyes" ; then
  20      PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0, GFTP_GTK=gftp-gtk, AC_MSG_ERROR(You have GLIB 2.0 installed but I cannot find GTK+ 2.0. Run configure with --disable-gtk20 or install GTK+ 2.0))
  21 -  fi
  22 -
  23 -  if test "x$GFTP_GTK" = "x" ; then
  24 -    AM_PATH_GTK(1.2.3, GFTP_GTK=gftp-gtk, AC_MSG_WARN(gFTP needs GTK+ 1.2.3 or higher for the graphical version. Only building the text version))
  25 -    GTHREAD_LIBS="-lgthread"
  26 -  else
  27      GTHREAD_LIBS="-lgthread-2.0"
  28 -  fi
  29 -
  30 -  if test "x$GFTP_GTK" = xgftp-gtk; then
  31 -    case $host in
  32 -      *-hpux*)
  33 -        AC_CHECK_LIB(rt, sem_init)
  34 -
  35 -        # From H.Merijn Brand <h.m.brand@hccnet.nl>
  36 -        echo '#define pthread_attr_init(x) __pthread_attr_init_system(x)' >>confdefs.h
  37 -        echo '#define pthread_create(x) __pthread_create_system(x)' >>confdefs.h
  38 -        ;;
  39 -    esac
  40
  41      AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread")
  42
  43 @@ -235,38 +212,6 @@
  44      fi
  45
  46      PTHREAD_CFLAGS="-D_REENTRANT"
  47 -
  48 -    # I took some of these from the glib 1.3.3 configure.in
  49 -    case $host in
  50 -      *-aix*)
  51 -        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
  52 -        if test x"$GCC" = xyes; then
  53 -          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -mthreads"
  54 -        fi
  55 -        ;;
  56 -      *-freebsd*)
  57 -        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
  58 -
  59 -        # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  60 -        # -mthreads flag.
  61 -        ;;
  62 -      *-openbsd*)
  63 -        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
  64 -          if test "x$PTHREAD_LIBS" = "x-lc_r"; then
  65 -            PTHREAD_LIBS="-pthread"
  66 -          fi
  67 -        ;;
  68 -      *-sysv5uw7*)  # UnixWare 7
  69 -        if test "$GCC" != "yes"; then
  70 -          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -Kthread"
  71 -        else
  72 -          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -pthread"
  73 -        fi
  74 -        ;;
  75 -      *-dg-dgux*)  # DG/UX
  76 -        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_POSIX4A_DRAFT10_SOURCE"
  77 -    esac
  78 -  fi
  79  fi
  80  AC_SUBST(PTHREAD_CFLAGS)
  81  AC_SUBST(PTHREAD_LIBS)