configure.ac: Move gpustitch to CUDA section

This was broken, because FOUND_CUDA was used before it was defined
2026-03-22 13:40:31 +00:00 · 2022-10-07 12:34:28 +02:00
parent fc5f4820b4
commit e16ea03e5e
1 changed files with 55 additions and 55 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -727,61 +727,6 @@ fi

 AC_SUBST(DECKLINK_PATH)

-# -------------------------------------------------------------------------------------------------
-# gpustitch stuff
-# -------------------------------------------------------------------------------------------------
-
-GPUSTITCH_OBJ=
-GPUSTITCH_INC=
-GPUSTITCH_LIB=
-GPUSTITCH_PATH=
-gpustitch=no
-gpustitch_req=auto
-
-AC_ARG_ENABLE(gpustitch,
-[  --disable-gpustitch      disable gpustitch (default is auto)]
-[                          Requires: CUDA gpustitch],
-	[gpustitch_req=$enableval])
-
-PKG_CHECK_MODULES([LIBGPUSTITCH], [libgpustitch >= 0.0.1 ], [found_gpustitch=yes], [found_gpustitch=no])
-
-SAVED_LIBS=$LIBS
-LIBS="$LIBS -lgpustitch"
-AC_CHECK_HEADER([libgpustitch/stitcher.hpp])
-LIBS=$SAVED_LIBS
-
-if test "$ac_cv_header_libgpustitch_stitcher_hpp" != yes
-then
-	found_gpustitch=no
-else
-	if test "$found_gpustitch" != yes
-	then
-		GPUSTITCH_LIB="$GPUSTITCH_LIB -lgpustitch"
-		found_gpustitch=yes
-	fi
-fi
-
-if test "$gpustitch_req" != no -a \
-        "$found_gpustitch" = yes -a \
-        "$FOUND_CUDA" = yes
-
-then
-        gpustitch=yes
-
-        GPUSTITCH_INC="$GPUSTITCH_INC $LIBGPUSTITCH_CFLAGS"
-        GPUSTITCH_LIB="$GPUSTITCH_LIB $LIBGPUSTITCH_LIBS"
-        GPUSTITCH_OBJ="src/video_capture/gpustitch.o src/utils/cuda_pix_conv.$CU_OBJ_SUFFIX $CUDA_COMMON_OBJ"
-        AC_DEFINE([HAVE_GPUSTITCH], [1], [Build with GPUSTITCH support])
-        ADD_MODULE("vidcap_gpustitch", "$GPUSTITCH_OBJ", "$GPUSTITCH_LIB")
-
-        INC="$INC $GPUSTITCH_INC"
-        CUDA_MESSAGE
-fi
-
-if test $gpustitch_req = yes -a $gpustitch = no; then
-        AC_MSG_ERROR([GPUSTITCH not found]);
-fi
-
 # -------------------------------------------------------------------------------------------------
 # Bluefish444 stuff
 # -------------------------------------------------------------------------------------------------
@@ -2434,6 +2379,61 @@ then
        AC_MSG_ERROR([GPUJPEG DXT transcoder not found])
 fi

+# -------------------------------------------------------------------------------------------------
+# gpustitch stuff
+# -------------------------------------------------------------------------------------------------
+
+GPUSTITCH_OBJ=
+GPUSTITCH_INC=
+GPUSTITCH_LIB=
+GPUSTITCH_PATH=
+gpustitch=no
+gpustitch_req=auto
+
+AC_ARG_ENABLE(gpustitch,
+[  --disable-gpustitch      disable gpustitch (default is auto)]
+[                          Requires: CUDA gpustitch],
+	[gpustitch_req=$enableval])
+
+PKG_CHECK_MODULES([LIBGPUSTITCH], [libgpustitch >= 0.0.1 ], [found_gpustitch=yes], [found_gpustitch=no])
+
+SAVED_LIBS=$LIBS
+LIBS="$LIBS -lgpustitch"
+AC_CHECK_HEADER([libgpustitch/stitcher.hpp])
+LIBS=$SAVED_LIBS
+
+if test "$ac_cv_header_libgpustitch_stitcher_hpp" != yes
+then
+	found_gpustitch=no
+else
+	if test "$found_gpustitch" != yes
+	then
+		GPUSTITCH_LIB="$GPUSTITCH_LIB -lgpustitch"
+		found_gpustitch=yes
+	fi
+fi
+
+if test "$gpustitch_req" != no -a \
+        "$found_gpustitch" = yes -a \
+        "$FOUND_CUDA" = yes
+
+then
+        gpustitch=yes
+
+        GPUSTITCH_INC="$GPUSTITCH_INC $LIBGPUSTITCH_CFLAGS"
+        GPUSTITCH_LIB="$GPUSTITCH_LIB $LIBGPUSTITCH_LIBS"
+        GPUSTITCH_OBJ="src/video_capture/gpustitch.o src/utils/cuda_pix_conv.$CU_OBJ_SUFFIX $CUDA_COMMON_OBJ"
+        AC_DEFINE([HAVE_GPUSTITCH], [1], [Build with GPUSTITCH support])
+        ADD_MODULE("vidcap_gpustitch", "$GPUSTITCH_OBJ", "$GPUSTITCH_LIB")
+
+        INC="$INC $GPUSTITCH_INC"
+        CUDA_MESSAGE
+fi
+
+if test $gpustitch_req = yes -a $gpustitch = no; then
+        AC_MSG_ERROR([GPUSTITCH not found]);
+fi
+
 # -------------------------------------------------------------------------------------------------
 # SAGE stuff