--- libdv-0.98/configure.orig 2003-05-06 10:56:48.000000000 +0200 +++ libdv-0.98/configure 2003-05-06 11:00:57.000000000 +0200 @@ -7184,6 +7184,7 @@ HOST_X86_FALSE= fi +if $use_gtk; then REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' succeeded=no @@ -7278,9 +7279,10 @@ echo "$as_me: error: Library requirements ($REQUIRES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi - +fi REQUIRES='' + if $use_sdl; then echo "$as_me:7285: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 @@ -9487,8 +9489,11 @@ fi done - +if test "x$enable_gtktest" = "xyes" ; then ac_config_files="$ac_config_files Makefile libdv.spec libdv.pc libdv/Makefile playdv/Makefile encodedv/Makefile" +else +ac_config_files="$ac_config_files Makefile libdv.spec libdv.pc libdv/Makefile" +fi cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9817,6 +9822,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do +if test "x$enable_gtktest" = "xyes" ; then case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -9831,6 +9837,20 @@ echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac +else + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "libdv.spec" ) CONFIG_FILES="$CONFIG_FILES libdv.spec" ;; + "libdv.pc" ) CONFIG_FILES="$CONFIG_FILES libdv.pc" ;; + "libdv/Makefile" ) CONFIG_FILES="$CONFIG_FILES libdv/Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:9830: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +fi done # If the user did not use the arguments to specify the items to instantiate, @@ -9850,6 +9870,12 @@ trap '{ (exit 1); exit 1; }' 1 2 13 15 } +if test "x$enable_gtktest" = "xyes" ; then + subdirs="libdv playdv encodedv" +else + subdirs="libdv" +fi + # Create a (secure) tmp directory for tmp files. : ${TMPDIR=/tmp} { @@ -9978,6 +10004,7 @@ s,@REQUIRES_NOPKGCONFIG@,$REQUIRES_NOPKGCONFIG,;t t s,@ac_aux_dir@,$ac_aux_dir,;t t s,@RPM_RELEASE@,$RPM_RELEASE,;t t +s,@subdirs@,$subdirs,;t t CEOF _ACEOF