[xine-cvs] CVS: xine-vcdnav/vcdimager-0.7.12-rocky configure.ac,1.2,1.3

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-vcdnav/vcdimager-0.7.12-rocky
In directory sc8-pr-cvs1:/tmp/cvs-serv11651

Modified Files:
	configure.ac 
Log Message:
Link OS-dependent files rather than copy them.


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/vcdimager-0.7.12-rocky/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.ac	24 Jan 2003 20:00:28 -0000	1.2
+++ configure.ac	24 Jan 2003 23:19:00 -0000	1.3
@@ -11,12 +11,6 @@
 
 dnl conditionally built frontends
 
-enable_gnome_fe=no
-
-dnl AC_ARG_WITH(gnome-frontend,
-dnl	[  --with-gnome-frontend   enable gnome frontend (not enabled by default)], 
-dnl	enable_gnome_fe="${withval}", enable_gnome_fe=no)
-
 AC_ARG_WITH(cli-frontend,
 	[  --without-cli-frontend  enable cli frontend (enabled by default)], 
 	enable_cli_fe="${withval}", enable_cli_fe=yes)
@@ -44,14 +38,18 @@
 AM_PROG_CC_STDC
 AC_PROG_LIBTOOL
 AC_PROG_AWK
+AC_PROG_LN_S
 
 dnl libs
 AC_CHECK_FUNCS(snprintf vsnprintf, , [AC_MSG_ERROR(required function not found)])
 
-if test "x$enable_cli_fe" = "xyes" -o "x$enable_xml_fe" = "xyes"; then
-  AM_PATH_LIBPOPT(, [enable_cli_fe=no; enable_xml_fe=no])
+enable_cli_fe_popt=no
+
+if test "x$enable_cli_fe" = "xyes"; then
+ AC_CHECK_LIB(popt, poptGetContext, POPT_LIBS="-lpopt", enable_cli_fe_popt=yes)
 fi
 
+
 if test "x$enable_xml_fe" = "xyes"; then
   AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
 fi
@@ -71,6 +69,34 @@
    AC_CHECK_SIZEOF(long long, 8)
 fi
 
+if test "x$enable_cli_fe" = "xyes" \
+	-a "x$enable_cli_fe_popt" != "xyes"
+then
+ AC_CHECK_HEADER(popt.h, , enable_cli_fe_popt=yes)
+fi
+
+if test "x$enable_cli_fe" = "xyes" \
+	-a "x$enable_cli_fe_popt" != "xyes"
+then
+ AC_MSG_CHECKING([checking whether popt is new enough])
+ AC_EGREP_HEADER(poptHelpOptions, popt.h, , enable_cli_fe_popt=yes)
+
+ if test "x$enable_cli_fe_popt" = "xyes"; then
+  AC_MSG_RESULT([no])
+ else
+  AC_MSG_RESULT([seems so])
+ fi
+fi
+
+dnl GNOME_COMPILE_WARNINGS
+
+if test "x$enable_gnome_fe" = "xyes"; then
+ GNOME_X_CHECKS
+ dnl Subst PACKAGE_PIXMAPS_DIR.
+ PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/${PACKAGE}"
+ AC_SUBST(PACKAGE_PIXMAPS_DIR)
+fi
+
 dnl compiler
 AC_C_BIGENDIAN
 AC_C_CONST
@@ -141,6 +167,7 @@
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 
 AM_CONDITIONAL(CYGWIN, test "x$CYGWIN" = "xyes")
+AM_CONDITIONAL(BUILD_CLI_FE_POPT, test "x$enable_cli_fe_popt" = "xyes")
 AM_CONDITIONAL(BUILD_CLI_FE, test "x$enable_cli_fe" = "xyes")
 AM_CONDITIONAL(BUILD_XML_FE, test "x$enable_xml_fe" = "xyes")
 
@@ -183,25 +210,35 @@
 AC_SUBST(LIBVCD_LIBS)
 AC_SUBST(LIBVCDINFO_LIBS)
 
-AC_OUTPUT([
-Makefile
-libvcd/Makefile
-frontends/Makefile
-frontends/cli/Makefile
-frontends/cli/popt/Makefile
+AC_OUTPUT([ \
+Makefile \
+libvcd/Makefile \
+frontends/Makefile \
+frontends/cli/Makefile \
+frontends/cli/popt/Makefile \
 tests/Makefile	
 ])
 
-if test "x$OS" != "x"
-then
-  cp libvcd/$OS/*.c libvcd
+if test "x$OS" != "x"; then 
+ (
+   cd libvcd
+   rm -f vcd_image_cd.c
+   $as_ln_s $OS/vcd_image_cd.c vcd_image_cd.c
+   rm -f vcd_mmc.c
+   if test -r $OS/vcd_mmc.c
+   then
+     $as_ln_s $OS/vcd_mmc.c vcd_mmc.c
+   fi
+ )
 fi
 
 echo "
 Setup:
   Install path:     ${prefix}
   Build CLI FE:	    $enable_cli_fe
+  Use own popt lib: $enable_cli_fe_popt
   Build XML FE:	    $enable_xml_fe
+  Build vcddump:    $build_vcddump
 "
 
 if test "x$enable_cli_fe" != "xyes" -a "x$enable_xml_fe" != "xyes"