- release 5 (by relup.sh)

[packages/gftp.git] / gftp-gtk1_check.patch

diff -aurN gftp-2.0.18.orig/configure.in gftp-2.0.18/configure.in
--- gftp-2.0.18.orig/configure.in	2005-02-04 16:42:32.000000000 +0100
+++ gftp-2.0.18/configure.in	2005-04-30 19:02:22.000000000 +0200
@@ -79,10 +79,6 @@
   found_glib20=0;
 fi
 
-if test "x$GFTP_TEXT" = "x" -a $found_glib20 = 0 ; then
-  AM_PATH_GLIB(1.2.3, , AC_MSG_ERROR(gFTP needs GLIB 1.2.3 or higher))
-fi
-
 EXTRA_LIBS=""
 
 # FreeBSD needs this
@@ -191,27 +187,8 @@
 GTHREAD_LIBS=""
 
 if test "x$enable_gtkport" = "xyes" ; then
-  if test $found_glib20 = 1 -a "x$enable_gtk20" = "xyes" ; then
     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))
-  fi
-
-  if test "x$GFTP_GTK" = "x" ; then
-    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))
-    GTHREAD_LIBS="-lgthread"
-  else
     GTHREAD_LIBS="-lgthread-2.0"
-  fi
-
-  if test "x$GFTP_GTK" = xgftp-gtk; then
-    case $host in
-      *-hpux*)
-        AC_CHECK_LIB(rt, sem_init)
-
-        # From H.Merijn Brand <h.m.brand@hccnet.nl>
-        echo '#define pthread_attr_init(x) __pthread_attr_init_system(x)' >>confdefs.h
-        echo '#define pthread_create(x) __pthread_create_system(x)' >>confdefs.h
-        ;;
-    esac
 
     AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread")
 
@@ -235,38 +212,6 @@
     fi
 
     PTHREAD_CFLAGS="-D_REENTRANT"
-
-    # I took some of these from the glib 1.3.3 configure.in
-    case $host in
-      *-aix*)
-        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
-        if test x"$GCC" = xyes; then
-          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -mthreads"
-        fi
-        ;;
-      *-freebsd*)
-        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
-
-        # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
-        # -mthreads flag.
-        ;;
-      *-openbsd*)
-        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
-          if test "x$PTHREAD_LIBS" = "x-lc_r"; then
-            PTHREAD_LIBS="-pthread"
-          fi
-        ;;
-      *-sysv5uw7*)  # UnixWare 7
-        if test "$GCC" != "yes"; then
-          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -Kthread"
-        else
-          PTHREAD_CFLAGS="$PTHREAD_CFLAGS -pthread"
-        fi
-        ;;
-      *-dg-dgux*)  # DG/UX
-        PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_POSIX4A_DRAFT10_SOURCE"
-    esac
-  fi
 fi
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)